diff options
author | Marco Platania <platania@research.att.com> | 2018-08-02 13:02:59 -0400 |
---|---|---|
committer | Marco Platania <platania@research.att.com> | 2018-08-02 13:02:59 -0400 |
commit | d4c5f6b933e2ba449cb1ddf39355f03affec9b53 (patch) | |
tree | bc2d3f43190936e105f98484810ee0670352f91a /boot/sdnc_install.sh | |
parent | 62347152ef6e9d284d8bc45373fb6f83a5162110 (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/sdnc_install.sh')
-rw-r--r-- | boot/sdnc_install.sh | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/boot/sdnc_install.sh b/boot/sdnc_install.sh index e7333cd7..2c82eea5 100644 --- a/boot/sdnc_install.sh +++ b/boot/sdnc_install.sh @@ -26,45 +26,18 @@ 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 git ntp ntpdate make jq # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sdnc_vm_init.sh > /opt/sdnc_vm_init.sh -unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sdnc_serv.sh > /opt/sdnc_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/sdnc_serv.sh unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh chmod +x /opt/imagetest.sh chmod +x /opt/sdnc_vm_init.sh chmod +x /opt/sdnc_serv.sh +sed -i "s|cmd=\"\"|cmd=\"./sdnc_vm_init.sh\"|g" /opt/sdnc_serv.sh mv /opt/sdnc_serv.sh /etc/init.d update-rc.d sdnc_serv.sh defaults |