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/clamp_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/clamp_install.sh')
| -rw-r--r-- | boot/clamp_install.sh | 47 |
1 files changed, 3 insertions, 44 deletions
diff --git a/boot/clamp_install.sh b/boot/clamp_install.sh index 24e95373..ffe4d14e 100644 --- a/boot/clamp_install.sh +++ b/boot/clamp_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 # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip clamp_vm_init.sh > /opt/clamp_vm_init.sh -unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip clamp_serv.sh > /opt/clamp_serv.sh +unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/clamp_serv.sh unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh chmod +x /opt/imagetest.sh chmod +x /opt/clamp_vm_init.sh chmod +x /opt/clamp_serv.sh +sed -i "s|cmd=\"\"|cmd=\"./clamp_vm_init.sh\"|g" /opt/clamp_serv.sh mv /opt/clamp_serv.sh /etc/init.d update-rc.d clamp_serv.sh defaults @@ -103,21 +76,7 @@ service docker restart echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head resolvconf -u -# Clone Gerrit repository +# Clone Gerrit repository and run docker containers cd /opt git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO - -# Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes -if [[ $CLOUD_ENV != "rackspace" ]] -then - sed -i "s/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub - grub-mkconfig -o /boot/grub/grub.cfg - sed -i "s/ens[0-9]*/eth0/g" /etc/network/interfaces.d/*.cfg - sed -i "s/ens[0-9]*/eth0/g" /etc/udev/rules.d/70-persistent-net.rules - echo 'network: {config: disabled}' >> /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg - echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic - reboot -fi - -# Run docker containers. For openstack Ubuntu 16.04 images this will run as a service after the VM has restarted ./clamp_vm_init.sh |