X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Fdcae_install.sh;h=09a9e33d7e259abb6062a3fee683eafce1cd3343;hb=a61046f9ae9639b666f734c4334bc4bf97bf076d;hp=0f9fef01c802cded30caa017f3e086357c1ce866;hpb=efaf7672e8e15823f871ea7689cb9aaf83630e19;p=demo.git diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh index 0f9fef01..09a9e33d 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) @@ -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 make +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