From d4c5f6b933e2ba449cb1ddf39355f03affec9b53 Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Thu, 2 Aug 2018 13:02:59 -0400 Subject: 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 --- boot/mr_install.sh | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) (limited to 'boot/mr_install.sh') diff --git a/boot/mr_install.sh b/boot/mr_install.sh index 152e67f8..b7573589 100644 --- a/boot/mr_install.sh +++ b/boot/mr_install.sh @@ -26,34 +26,6 @@ then cp /home/ubuntu/.ssh/authorized_keys /root/.ssh fi -# Set private IP in /etc/network/interfaces manually in the presence of public interface -# 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 - LOCAL_IP=$(cat /opt/config/local_ip_addr.txt) - 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 - - echo "auto eth1" >> /etc/network/interfaces - echo "iface eth1 inet static" >> /etc/network/interfaces - echo " address $LOCAL_IP" >> /etc/network/interfaces - echo " netmask $NETMASK" >> /etc/network/interfaces - echo " mtu $MTU" >> /etc/network/interfaces - ifup eth1 -fi - # Download dependencies apt-get update apt-get install -y apt-transport-https ca-certificates wget make git ntp ntpdate @@ -61,11 +33,12 @@ apt-get install -y apt-transport-https ca-certificates wget make git ntp ntpdate # Download scripts from Nexus # a) scripts for message router (mr) unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip mr_vm_init.sh > /opt/mr_vm_init.sh -unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip mr_serv.sh > /opt/mr_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/mr_serv.sh unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh chmod +x /opt/imagetest.sh chmod +x /opt/mr_vm_init.sh chmod +x /opt/mr_serv.sh +sed -i "s|cmd=\"\"|cmd=\"./mr_vm_init.sh\"|g" /opt/mr_serv.sh mv /opt/mr_serv.sh /etc/init.d update-rc.d mr_serv.sh defaults -- cgit 1.2.3-korg