X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Fdcae_install.sh;h=eac9a69ca7851fc9204e3e34fd7049b594028437;hb=refs%2Fheads%2Famsterdam;hp=ee818e1980fc68ee535f3a3d819eac78694ac7b3;hpb=abe5430faeff2ad78460e9f28a3b081a651744fc;p=demo.git

diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh
index ee818e19..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)
@@ -38,6 +40,8 @@ DCAE_HDP1_IP_ADDR=$(cat /opt/config/dcae_hdp1_ip_addr.txt)
 DCAE_HDP2_IP_ADDR=$(cat /opt/config/dcae_hdp2_ip_addr.txt)
 DCAE_HDP3_IP_ADDR=$(cat /opt/config/dcae_hdp3_ip_addr.txt)
 
+MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
+
 if [[ $CLOUD_ENV != "rackspace" ]]
 then
 	# Add host name to /etc/host to avoid warnings in openstack images
@@ -71,17 +75,19 @@ then
 	echo "iface eth1 inet static" >> /etc/network/interfaces
 	echo "    address $DCAE_IP_ADDR" >> /etc/network/interfaces
 	echo "    netmask $NETMASK" >> /etc/network/interfaces
+	echo "    mtu $MTU" >> /etc/network/interfaces
 	ifup eth1
 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
@@ -98,14 +104,16 @@ curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose
 chmod +x /opt/docker/docker-compose
 
 # Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
-
+DNS_FLAG=""
+if [ -s /opt/config/dns_ip_addr.txt ]
+then
+	DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
+fi
 if [ -s /opt/config/external_dns.txt ]
 then
-	echo "DOCKER_OPTS=\"--dns $(cat /opt/config/external_dns.txt) --mtu=$MTU\"" >> /etc/default/docker
-else
-	echo "DOCKER_OPTS=\"--mtu=$MTU\"" >> /etc/default/docker
+	DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
 fi
+echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
 
 cp /lib/systemd/system/docker.service /etc/systemd/system
 sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
@@ -117,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
@@ -149,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