summaryrefslogtreecommitdiffstats
path: root/boot/portal_install.sh
diff options
context:
space:
mode:
Diffstat (limited to 'boot/portal_install.sh')
-rw-r--r--boot/portal_install.sh32
1 files changed, 2 insertions, 30 deletions
diff --git a/boot/portal_install.sh b/boot/portal_install.sh
index af96e5e4..d052d655 100644
--- a/boot/portal_install.sh
+++ b/boot/portal_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 unzip mysql-client-core-5.6 ntp ntpdate make
# Download scripts from Nexus
unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip portal_vm_init.sh > /opt/portal_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip portal_serv.sh > /opt/portal_serv.sh
+unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/portal_serv.sh
unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
chmod +x /opt/imagetest.sh
chmod +x /opt/portal_vm_init.sh
chmod +x /opt/portal_serv.sh
+sed -i "s|cmd=\"\"|cmd=\"./portal_vm_init.sh\"|g" /opt/portal_serv.sh
mv /opt/portal_serv.sh /etc/init.d
update-rc.d portal_serv.sh defaults
@@ -106,5 +79,4 @@ resolvconf -u
# Clone Gerrit repository and run docker containers
cd /opt
git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
-
./portal_vm_init.sh