Fix path to docker in Policy

[demo.git] / boot / aai_install.sh

diff --git a/boot/aai_install.sh b/boot/aai_install.sh
index 2a99451..cf9043b 100644 (file)
--- a/boot/aai_install.sh
+++ b/boot/aai_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)
 
@@ -19,20 +18,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/aai_vm_init.sh -o /opt/aai_vm_init.sh
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/aai_serv.sh -o /opt/aai_serv.sh
+curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/aai_vm_init.sh -o /opt/aai_vm_init.sh
+curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/aai_serv.sh -o /opt/aai_serv.sh
 chmod +x /opt/aai_vm_init.sh
 chmod +x /opt/aai_serv.sh
 mv /opt/aai_serv.sh /etc/init.d
 update-rc.d aai_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-trusty 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