X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Fmso_install.sh;h=9c10e30351aafd477e390533a1c1f6b8acf27bec;hb=478e6defde66ace4b204fc20fee7a24ef77ccceb;hp=83d5f32a6e8e12a3919b084d4d1de6697e668a1c;hpb=d4852ac785d973ae82492f86249fb476987adaec;p=demo.git

diff --git a/boot/mso_install.sh b/boot/mso_install.sh
index 83d5f32a..9c10e303 100644
--- a/boot/mso_install.sh
+++ b/boot/mso_install.sh
@@ -2,8 +2,7 @@
 
 # Read configuration files
 NEXUS_REPO=$(cat /opt/config/nexus_repo.txt)
-ARTIFACT_VERSION=$(cat /opt/config/artifact_version.txt)
-DOCKER_KEY=$(cat /opt/config/docker_key.txt)
+ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
 DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 OPENSTACK_API_KEY=$(cat /opt/config/openstack_api_key.txt)
@@ -21,20 +20,18 @@ apt-get update
 apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
 
 # Download scripts from Nexus
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/docker_key.txt -o /opt/config/docker_key.txt
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/mso_vm_init.sh -o /opt/mso_vm_init.sh
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/mso_serv.sh -o /opt/mso_serv.sh
+curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/mso_vm_init.sh -o /opt/mso_vm_init.sh
+curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/mso_serv.sh -o /opt/mso_serv.sh
 chmod +x /opt/mso_vm_init.sh
 chmod +x /opt/mso_serv.sh
 mv /opt/mso_serv.sh /etc/init.d
 update-rc.d mso_serv.sh defaults
 
 # Download and install docker-engine and docker-compose
-apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys $DOCKER_KEY
 echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list
 apt-get update
 apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-apt-get install -y docker-engine
+apt-get install -y --allow-unauthenticated docker-engine
 
 mkdir /opt/docker
 curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
@@ -56,6 +53,7 @@ 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
+	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