Fix OPEN-O VM installation issues

Change-Id: I89079d0d690032b2ea88d0f30f2f20daa3098838
Issue-ID: INT-213
Signed-off-by: Marco Platania <platania@research.att.com>

diff --git a/boot/mvim_vm_init.sh b/boot/mvim_vm_init.sh
index ecdb921..324b173 100755 (executable)
--- a/boot/mvim_vm_init.sh
+++ b/boot/mvim_vm_init.sh
@@ -10,8 +10,8 @@ source /opt/config/onap_ips.txt
 
 # Refresh images
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/onap/multicloud/framework:latest
-docker pull $NEXUS_DOCKER_REPO/onap/multicloud/vio:latest
+docker pull $NEXUS_DOCKER_REPO/onap/multicloud/framework:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/multicloud/vio:$DOCKER_IMAGE_VERSION
 
 docker rm -f multicloud-broker
 docker rm -f multicloud-vio

diff --git a/boot/openo_install.sh b/boot/openo_install.sh
index c039d6c..ebf3861 100644 (file)
--- a/boot/openo_install.sh
+++ b/boot/openo_install.sh
@@ -7,7 +7,7 @@ DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 VNFSDK_BRANCH=$(cat /opt/config/vnfsdk_branch.txt)
 MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
-CODE_REPO=$(cat /opt/config/remote_repo.txt)
+VNFSDK_REPO=$(cat /opt/config/vnfsdk_repo.txt)
 
 # Add host name to /etc/host to avoid warnings in openstack images
 if [[ $CLOUD_ENV != "rackspace" ]]
@@ -101,7 +101,19 @@ resolvconf -u
 
 # Clone Gerrit repository and run docker containers
 cd /opt
-git clone -b $VNFSDK_BRANCH --single-branch $CODE_REPO
+git clone -b $VNFSDK_BRANCH --single-branch $VNFSDK_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
 
 ./msb_vm_init.sh
 sleep 2

diff --git a/boot/vfc_vm_init.sh b/boot/vfc_vm_init.sh
index 5e8df72..4d8070e 100755 (executable)
--- a/boot/vfc_vm_init.sh
+++ b/boot/vfc_vm_init.sh
@@ -8,5 +8,17 @@ DOCKER_IMAGE_VERSION=$(cat /opt/config/vfc_docker.txt)
 
 # Refresh images
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/catalog:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/emsdriver:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/gvnfmdriver:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/jujudriver:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/huawei:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/nslcm:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/resmanagement:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnflcm:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztevmanagerdriver:$DOCKER_IMAGE_VERSION
 
 # Insert docker run instructions here
\ No newline at end of file