X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Fasdc_install.sh;h=fff64320a2e7a565e4dc3e9f8d0df1a4fcc38e30;hb=478e6defde66ace4b204fc20fee7a24ef77ccceb;hp=c70787fc41d55f1a0d34195dc5d1143ef2eaefd3;hpb=dce86012866282cf906bc4f0a62cc5b224dac199;p=demo.git

diff --git a/boot/asdc_install.sh b/boot/asdc_install.sh
index c70787fc..fff64320 100644
--- a/boot/asdc_install.sh
+++ b/boot/asdc_install.sh
@@ -19,7 +19,6 @@ 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/$ARTIFACTS_VERSION/docker_key.txt -o /opt/config/docker_key.txt
 curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/asdc_vm_init.sh -o /opt/asdc_vm_init.sh
 curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/asdc_serv.sh -o /opt/asdc_serv.sh
 chmod +x /opt/asdc_vm_init.sh
@@ -28,25 +27,24 @@ mv /opt/asdc_serv.sh /etc/init.d
 update-rc.d asdc_serv.sh defaults
 
 # Download and install docker-engine and docker-compose
-DOCKER_KEY=$(cat /opt/config/docker_key.txt)
-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
 chmod +x /opt/docker/docker-compose
 
 # Create partition and mount the external volume
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/asdc_ext_volume_partitions.txt -o /opt/asdc_ext_volume_partitions.txt
+curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/asdc_ext_volume_partitions.txt -o /opt/asdc_ext_volume_partitions.txt
 
 if [[ $CLOUD_ENV == "rackspace" ]]
 then
 	DISK="xvdb"
 else
 	DISK="vdb"
+	sed -i "s/xvdb/vdb/g" /opt/asdc_ext_volume_partitions.txt
 fi
 
 sfdisk /dev/$DISK < /opt/asdc_ext_volume_partitions.txt
@@ -84,6 +82,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