From: Marco Platania Date: Wed, 12 Apr 2017 13:59:16 +0000 (-0400) Subject: move docker key instruction X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=commitdiff_plain;h=dce86012866282cf906bc4f0a62cc5b224dac199 move docker key instruction Change-Id: Ia91176e98e1e578aa05745aa8f3b97995ef8bb55 Signed-off-by: Marco Platania --- diff --git a/boot/aai_install.sh b/boot/aai_install.sh index 12e8ff9d..e68c408d 100644 --- a/boot/aai_install.sh +++ b/boot/aai_install.sh @@ -3,7 +3,6 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) -DOCKER_KEY=$(cat /opt/config/docker_key.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -28,6 +27,7 @@ mv /opt/aai_serv.sh /etc/init.d update-rc.d aai_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 diff --git a/boot/appc_install.sh b/boot/appc_install.sh index 0c7c5410..231602c9 100644 --- a/boot/appc_install.sh +++ b/boot/appc_install.sh @@ -3,7 +3,6 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) -DOCKER_KEY=$(cat /opt/config/docker_key.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) @@ -29,6 +28,7 @@ mv /opt/appc_serv.sh /etc/init.d update-rc.d appc_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 diff --git a/boot/asdc_install.sh b/boot/asdc_install.sh index 6beec3d2..c70787fc 100644 --- a/boot/asdc_install.sh +++ b/boot/asdc_install.sh @@ -3,7 +3,6 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) -DOCKER_KEY=$(cat /opt/config/docker_key.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) @@ -29,6 +28,7 @@ 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 diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh index 1215b70a..5ee19127 100644 --- a/boot/dcae_install.sh +++ b/boot/dcae_install.sh @@ -3,7 +3,6 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) -DOCKER_KEY=$(cat /opt/config/docker_key.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) @@ -48,6 +47,7 @@ mv /opt/dcae_serv.sh /etc/init.d update-rc.d dcae_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 diff --git a/boot/mr_install.sh b/boot/mr_install.sh index f5a27b2f..c01cfe2d 100644 --- a/boot/mr_install.sh +++ b/boot/mr_install.sh @@ -3,7 +3,6 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) -DOCKER_KEY=$(cat /opt/config/docker_key.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) @@ -29,6 +28,7 @@ mv /opt/mr_serv.sh /etc/init.d update-rc.d mr_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 diff --git a/boot/mso_install.sh b/boot/mso_install.sh index d74b10ac..76d7070d 100644 --- a/boot/mso_install.sh +++ b/boot/mso_install.sh @@ -3,7 +3,6 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) -DOCKER_KEY=$(cat /opt/config/docker_key.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) @@ -30,6 +29,7 @@ mv /opt/mso_serv.sh /etc/init.d update-rc.d mso_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 diff --git a/boot/policy_install.sh b/boot/policy_install.sh index 7459119e..12ddac01 100644 --- a/boot/policy_install.sh +++ b/boot/policy_install.sh @@ -3,7 +3,6 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) -DOCKER_KEY=$(cat /opt/config/docker_key.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) @@ -29,6 +28,7 @@ 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 diff --git a/boot/portal_install.sh b/boot/portal_install.sh index 0519c2db..9f07c003 100644 --- a/boot/portal_install.sh +++ b/boot/portal_install.sh @@ -3,7 +3,6 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) -DOCKER_KEY=$(cat /opt/config/docker_key.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) @@ -29,6 +28,7 @@ mv /opt/portal_serv.sh /etc/init.d update-rc.d portal_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 diff --git a/boot/robot_install.sh b/boot/robot_install.sh index 7be35756..1787f65c 100644 --- a/boot/robot_install.sh +++ b/boot/robot_install.sh @@ -3,7 +3,6 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) -DOCKER_KEY=$(cat /opt/config/docker_key.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) @@ -29,6 +28,7 @@ mv /opt/robot_serv.sh /etc/init.d update-rc.d robot_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 diff --git a/boot/sdnc_install.sh b/boot/sdnc_install.sh index fbd1cb1f..0c1cf5c6 100644 --- a/boot/sdnc_install.sh +++ b/boot/sdnc_install.sh @@ -3,7 +3,6 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) -DOCKER_KEY=$(cat /opt/config/docker_key.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) @@ -29,6 +28,7 @@ mv /opt/sdnc_serv.sh /etc/init.d update-rc.d sdnc_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 diff --git a/boot/vid_install.sh b/boot/vid_install.sh index a4b30168..0213b99b 100644 --- a/boot/vid_install.sh +++ b/boot/vid_install.sh @@ -3,7 +3,6 @@ # Read configuration files NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) -DOCKER_KEY=$(cat /opt/config/docker_key.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) @@ -29,6 +28,7 @@ mv /opt/vid_serv.sh /etc/init.d update-rc.d vid_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