X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Fdcae_install.sh;h=ece7744bba5247aeae7367c0bd59ccd66b96a664;hb=0f671db5d7e103befe6cd4c4874ddd92a0ebebfd;hp=09a9e33d7e259abb6062a3fee683eafce1cd3343;hpb=1b96a8f03f7b5d48ad9396b413c7f9accbc52bc3;p=demo.git

diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh
index 09a9e33d..ece7744b 100644
--- a/boot/dcae_install.sh
+++ b/boot/dcae_install.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 # Read configuration files
-NEXUS_REPO=$(cat /opt/config/nexus_repo.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,13 +18,12 @@ OPENSTACK_PASSWORD=$(cat /opt/config/openstack_password.txt)
 OPENSTACK_KEYNAME=$(cat /opt/config/key_name.txt)"_"$(cat /opt/config/rand_str.txt)"_dcae"
 OPENSTACK_PUBKEY=$(cat /opt/config/pub_key.txt)
 OPENSTACK_AUTH_METHOD=$(cat /opt/config/openstack_auth_method.txt)
-KEYSTONE_URL=$(cat /opt/config/keystone_url.txt)
+KEYSTONE_URL=$(cat /opt/config/keystone_url.txt)"/v2.0"
 OPENSTACK_TENANT_ID=$(cat /opt/config/tenant_id.txt)
 OPENSTACK_TENANT_NAME=OPEN-ECOMP
 OPENSTACK_REGION=$(cat /opt/config/openstack_region.txt)
 OPENSTACK_PRIVATE_NETWORK=$(cat /opt/config/openstack_private_network_name.txt)
 
-NEXUS_URL_ROOT=$(cat /opt/config/nexus_repo_root.txt)
 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)
@@ -86,8 +84,8 @@ apt-get update
 apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget make openjdk-8-jdk git ntp ntpdate
 
 # Download scripts from Nexus
-curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dcae_vm_init.sh -o /opt/dcae_vm_init.sh
-curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dcae_serv.sh -o /opt/dcae_serv.sh
+unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip dcae_vm_init.sh > /opt/dcae_vm_init.sh
+unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip dcae_serv.sh > /opt/dcae_serv.sh
 chmod +x /opt/dcae_vm_init.sh
 chmod +x /opt/dcae_serv.sh
 mv /opt/dcae_serv.sh /etc/init.d
@@ -152,7 +150,6 @@ NEXUS-URL-ROOT: $NEXUS_URL_ROOT
 NEXUS-USER: $NEXUS_USER
 NEXUS-PASSWORD: $NEXUS_PASSWORD
 NEXUS-URL-SNAPSHOTS: $NEXUS_URL_SNAPSHOTS
-NEXUS-RAWURL: $NEXUS_REPO
 
 DOCKER-REGISTRY: $DOCKER_REGISTRY
 DOCKER-VERSION: $DOCKER_VERSION