X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Fdcae_install.sh;h=933fb2c6536e9bd25bf0f1c462fedaca7759b0ea;hb=478e6defde66ace4b204fc20fee7a24ef77ccceb;hp=f69227c64671c4a86813e4c5a6a7045a279e9e0f;hpb=d26a4b00c757202960df8e41e5a0b2eae41a2d5c;p=demo.git

diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh
index f69227c6..933fb2c6 100644
--- a/boot/dcae_install.sh
+++ b/boot/dcae_install.sh
@@ -12,7 +12,7 @@ STATE=$(cat /opt/config/dcae_state.txt)
 HORIZON_URL=$(cat /opt/config/horizon_url.txt)
 OPENSTACK_USER=$(cat /opt/config/openstack_user.txt)
 OPENSTACK_PASSWORD=$(cat /opt/config/openstack_password.txt)
-OPENSTACK_KEYNAME=$(cat /opt/config/key_name.txt)$(cat /opt/config/rand_str.txt)"_dcae"
+OPENSTACK_KEYNAME=$(cat /opt/config/key_name.txt)"_"$(cat /opt/config/rand_str.txt)"_dcae"
 OPENSTACK_PUBKEY=$(cat /opt/config/pub_key.txt)
 KEYSTONE_URL=$(cat /opt/config/keystone_url.txt)
 OPENSTACK_TENANT_ID=$(cat /opt/config/tenant_id.txt)
@@ -25,6 +25,13 @@ NEXUS_USER=$(cat /opt/config/nexus_username.txt)
 NEXUS_PASSWORD=$(cat /opt/config/nexus_password.txt)
 NEXUS_URL_SNAPSHOTS=$(cat /opt/config/nexus_url_snapshots.txt)
 DOCKER_REGISTRY=$(cat /opt/config/nexus_docker_repo.txt)
+DCAE_CODE_VERSION=$(cat /opt/config/dcae_code_version.txt)
+
+DCAE_COLL_FLOAT_IP=$(cat /opt/config/dcae_coll_float_ip.txt)
+DCAE_DB_FLOAT_IP=$(cat /opt/config/dcae_db_float_ip.txt)
+DCAE_HDP1_FLOAT_IP=$(cat /opt/config/dcae_hdp1_float_ip.txt)
+DCAE_HDP2_FLOAT_IP=$(cat /opt/config/dcae_hdp2_float_ip.txt)
+DCAE_HDP3_FLOAT_IP=$(cat /opt/config/dcae_hdp3_float_ip.txt)
 
 # Add host name to /etc/host to avoid warnings in openstack images
 if [[ $CLOUD_ENV == "openstack" ]]
@@ -38,7 +45,6 @@ apt-get update
 apt-get install -y apt-transport-https ca-certificates wget make 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/dcae_vm_init.sh -o /opt/dcae_vm_init.sh
 curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/dcae_serv.sh -o /opt/dcae_serv.sh
 chmod +x /opt/dcae_vm_init.sh
@@ -47,12 +53,10 @@ 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
 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
@@ -72,7 +76,7 @@ mkdir -p /opt/app/dcae-controller
 cat > /opt/app/dcae-controller/config.yaml << EOF_CONFIG
 ZONE: $ZONE
 STATE: $STATE
-DCAE-VERSION: $ARTIFACTS_VERSION
+DCAE-VERSION: $DCAE_CODE_VERSION
 HORIZON-URL: $HORIZON_URL/$OPENSTACK_USER
 KEYSTONE-URL: $KEYSTONE_URL
 OPENSTACK-TENANT-ID: $OPENSTACK_TENANT_ID