summaryrefslogtreecommitdiffstats
path: root/boot/nbi_install.sh
diff options
context:
space:
mode:
Diffstat (limited to 'boot/nbi_install.sh')
-rw-r--r--boot/nbi_install.sh43
1 files changed, 2 insertions, 41 deletions
diff --git a/boot/nbi_install.sh b/boot/nbi_install.sh
index e05b1115..7705a25a 100644
--- a/boot/nbi_install.sh
+++ b/boot/nbi_install.sh
@@ -26,44 +26,17 @@ 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
-
apt-get update
apt-get install -y apt-transport-https ca-certificates curl git ntp ntpdate make software-properties-common
# Download scripts from Nexus
unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip nbi_vm_init.sh > /opt/nbi_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip nbi_serv.sh > /opt/nbi_serv.sh
+unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/nbi_serv.sh
unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
chmod +x /opt/imagetest.sh
chmod +x /opt/nbi_vm_init.sh
chmod +x /opt/nbi_serv.sh
+sed -i "s|cmd=\"\"|cmd=\"./nbi_vm_init.sh\"|g" /opt/nbi_serv.sh
mv /opt/nbi_serv.sh /etc/init.d
update-rc.d nbi_serv.sh defaults
@@ -105,18 +78,6 @@ service docker restart
echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
resolvconf -u
-# 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
cd /opt
./nbi_vm_init.sh