move docker key instruction

[demo.git] / boot / policy_install.sh

diff --git a/boot/policy_install.sh b/boot/policy_install.sh
index 9b019fd..12ddac0 100644 (file)
--- a/boot/policy_install.sh
+++ b/boot/policy_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)
 GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
@@ -20,15 +19,16 @@ 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/policy_vm_init.sh -o /opt/policy_vm_init.sh
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACT_VERSION/policy_serv.sh -o /opt/policy_serv.sh
+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/policy_vm_init.sh -o /opt/policy_vm_init.sh
+curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/policy_serv.sh -o /opt/policy_serv.sh
 chmod +x /opt/policy_vm_init.sh
 chmod +x /opt/policy_serv.sh
 mv /opt/policy_serv.sh /etc/init.d
 update-rc.d policy_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-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list
 apt-get update