X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Fdcae_install.sh;h=eac9a69ca7851fc9204e3e34fd7049b594028437;hb=82c066900616808b14489d57d2b2edcf2f0e9e82;hp=8e30e6df8863d6276a5089578a4e20521590a66c;hpb=9b11fadd0f3dc2fcdda935c6d9a4c4d5469a0100;p=demo.git

diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh
index 8e30e6df..eac9a69c 100644
--- a/boot/dcae_install.sh
+++ b/boot/dcae_install.sh
@@ -6,6 +6,8 @@ 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)
+CODE_REPO=$(cat /opt/config/remote_repo.txt)
+MR_REPO=$(cat /opt/config/mr_repo.txt)
 
 BASE=$(cat /opt/config/dcae_base_environment.txt)
 PUBLIC_NET_ID=$(cat /opt/config/public_net_id.txt)
@@ -17,7 +19,7 @@ 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)
@@ -78,13 +80,14 @@ then
 fi
 
 # Download dependencies
-add-apt-repository -y ppa:openjdk-r/ppa
+echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >>  /etc/apt/sources.list.d/java.list
+echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >>  /etc/apt/sources.list.d/java.list
 apt-get update
-apt-get install -y apt-transport-https ca-certificates wget make openjdk-8-jdk git ntp ntpdate
+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.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
+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
 chmod +x /opt/dcae_vm_init.sh
 chmod +x /opt/dcae_serv.sh
 mv /opt/dcae_serv.sh /etc/init.d
@@ -122,7 +125,7 @@ resolvconf -u
 
 # Clone Gerrit repository
 cd /opt
-git clone -b $GERRIT_BRANCH --single-branch http://gerrit.onap.org/r/dcae/demo/startup/controller.git dcae-startup-vm-controller
+git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO dcae-startup-vm-controller
 
 # Build a configuration file for the DCAE Controller.
 cd /opt/dcae-startup-vm-controller
@@ -154,7 +157,7 @@ NEXUS-RAWURL: $NEXUS_REPO
 DOCKER-REGISTRY: $DOCKER_REGISTRY
 DOCKER-VERSION: $DOCKER_VERSION
 
-GIT-MR-REPO: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git
+GIT-MR-REPO: $MR_REPO
 
 public_net_id: $PUBLIC_NET_ID
 dcae_ip_addr: $DCAE_IP_ADDR