summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-10-11 19:44:24 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-11 19:44:24 +0000
commitbf58a19263620322eb8308826728aa4f91f79eb1 (patch)
treeb0b0ed34575e575a6658786ec24d22466dcab504
parentc4e488b0e69567f49c1f5b17efa288116d125fe5 (diff)
parent5845af87c4961424a0a4a06bd0f2da7776f91bdf (diff)
Merge "Fix script bugs"
-rw-r--r--boot/dcae2_install.sh35
1 files changed, 18 insertions, 17 deletions
diff --git a/boot/dcae2_install.sh b/boot/dcae2_install.sh
index df1d513c..f6041728 100644
--- a/boot/dcae2_install.sh
+++ b/boot/dcae2_install.sh
@@ -24,25 +24,26 @@ fi
# Some VM images don't add the private interface automatically, we have to do it during the component installation
if [[ $CLOUD_ENV == "openstack_nofloat" ]]
then
- CIDR=$(cat /opt/config/oam_network_cidr.txt)
- BITMASK=$(echo $CIDR | cut -d"/" -f2)
+ #CIDR=$(cat /opt/config/oam_network_cidr.txt)
+ #BITMASK=$(echo $CIDR | cut -d"/" -f2)
# Compute the netmask based on the network cidr
- if [[ $BITMASK == "8" ]]
- then
- NETMASK=255.0.0.0
- elif [[ $BITMASK == "16" ]]
- then
- NETMASK=255.255.0.0
- elif [[ $BITMASK == "24" ]]
- then
- NETMASK=255.255.255.0
- fi
+ #if [[ $BITMASK == "8" ]]
+ #then
+ # NETMASK=255.0.0.0
+ #elif [[ $BITMASK == "16" ]]
+ #then
+ # NETMASK=255.255.0.0
+ #elif [[ $BITMASK == "24" ]]
+ #then
+ # NETMASK=255.255.255.0
+ #fi
echo "auto eth1" >> /etc/network/interfaces
- echo "iface eth1 inet static" >> /etc/network/interfaces
- echo " address $DCAE_IP_ADDR" >> /etc/network/interfaces
- echo " netmask $NETMASK" >> /etc/network/interfaces
+ #echo "iface eth1 inet static" >> /etc/network/interfaces
+ #echo " address $DCAE_IP_ADDR" >> /etc/network/interfaces
+ #echo " netmask $NETMASK" >> /etc/network/interfaces
+ echo "iface eth1 inet dhcp" >> /etc/network/interfaces
echo " mtu $MTU" >> /etc/network/interfaces
ifup eth1
fi
@@ -59,7 +60,7 @@ curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dcae2_serv.sh -o /opt/
chmod +x /opt/dcae2_vm_init.sh
chmod +x /opt/dcae2_serv.sh
mv /opt/dcae2_serv.sh /etc/init.d
-update-rc.d dcae_serv.sh defaults
+update-rc.d dcae2_serv.sh defaults
# Download and install docker-engine and docker-compose
echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list
@@ -125,7 +126,7 @@ openstack:
keypair: '$OPENSTACK_KEYNAME'
key_filename: '/opt/dcae/key'
location_prefix: '$ZONE'
-location_domain: 'onapdevlab.onap.org'
+location_domain: 'dcae.onapdevlab.onap.org'
codesource_url: 'https://nexus.onap.org/service/local/repositories/raw/content'
codesource_version: 'org.onap.dcaegen2.deployments/releases/scripts'
EOF_CONFIG