aboutsummaryrefslogtreecommitdiffstats
path: root/boot/dcae2_install.sh
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2018-08-02 13:02:59 -0400
committerMarco Platania <platania@research.att.com>2018-08-02 13:02:59 -0400
commitd4c5f6b933e2ba449cb1ddf39355f03affec9b53 (patch)
treebc2d3f43190936e105f98484810ee0670352f91a /boot/dcae2_install.sh
parent62347152ef6e9d284d8bc45373fb6f83a5162110 (diff)
Cleanup ONAP installation via Heat
- Remove all the parts of code related to deprecated configurations - Consolidate serv.sh scripts in a single one - Allow SO resolution via DNS (in addition to MSO) Change-Id: I6cabacdabaa3c5158ee101057738584922858fc9 Issue-ID: INT-526 Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'boot/dcae2_install.sh')
-rwxr-xr-xboot/dcae2_install.sh10
1 files changed, 2 insertions, 8 deletions
diff --git a/boot/dcae2_install.sh b/boot/dcae2_install.sh
index 6446efa5..d0f5fd6e 100755
--- a/boot/dcae2_install.sh
+++ b/boot/dcae2_install.sh
@@ -52,11 +52,12 @@ apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate pyth
# Download scripts from Nexus
unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip dcae2_vm_init.sh > /opt/dcae2_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip dcae2_serv.sh > /opt/dcae2_serv.sh
+unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/dcae2_serv.sh
unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
chmod +x /opt/imagetest.sh
chmod +x /opt/dcae2_vm_init.sh
chmod +x /opt/dcae2_serv.sh
+sed -i "s|cmd=\"\"|cmd=\"./dcae2_vm_init.sh\"|g" /opt/dcae2_serv.sh
mv /opt/dcae2_serv.sh /etc/init.d
update-rc.d dcae2_serv.sh defaults
@@ -70,7 +71,6 @@ mkdir -p /opt/docker
curl -L "https://github.com/docker/compose/releases/download/1.9.0/docker-compose-$(uname -s)-$(uname -m)" > /opt/docker/docker-compose
chmod +x /opt/docker/docker-compose
-
# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may
# need to know the external DNS IP
DNS_FLAG=""
@@ -103,19 +103,13 @@ echo "$(cat /opt/config/dcae_ip_addr.txt) dockerhost" >>/etc/hosts
echo "nameserver $DNS_IP_ADDR" >> /etc/resolvconf/resolv.conf.d/head
resolvconf -u
-
# prepare the configurations needed by DCAEGEN2 installer
rm -rf /opt/app/config
mkdir -p /opt/app/config
-
# private key
sed -e 's/\\n/\n/g' /opt/config/priv_key | sed -e 's/^[ \t]*//g; s/[ \t]*$//g' > /opt/app/config/key
chmod 777 /opt/app/config/key
-# move keystone url file
-#cp /opt/config/keystone_url.txt /opt/app/config/keystone_url.txt
-
-
cd /opt
./dcae2_vm_init.sh