Add proxying healthcheck to consul etc

Changes are for:
1. Proxying healthcheck API call to Consul's health API using a Nginx
container proxy.  Also some code cleanup.
2. Add support for posting floating addresses to Designate DNS
3. Add addition parameters in heat for supporting spinning up DCAE in
a separate OS/tenant (due to lack of Designate support in main Integration
OS/tenant)

Issue-Id: DCAEGEN2-127
Change-Id: Iac66eddbdd1dfadfc92bf2a1e372c6ad55bd0ab1
Signed-off-by: Lusheng Ji <lji@research.att.com>

3 files changed, 48 insertions, 58 deletions

diff --git a/boot/dcae2_install.sh b/boot/dcae2_install.sh
index 21587467..344d2c0b 100644
--- a/boot/dcae2_install.sh
+++ b/boot/dcae2_install.sh
@@ -15,41 +15,13 @@ MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | h
 if [[ $CLOUD_ENV != "rackspace" ]]
 then
 	# Add host name to /etc/host to avoid warnings in openstack images
-	echo 127.0.0.1 $(hostname) >> /etc/hosts
+	echo "127.0.0.1 $(hostname)" >> /etc/hosts
 
 	# Allow remote login as root
 	mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
 	cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
 fi
 
-# Set private IP in /etc/network/interfaces manually in the presence of public interface
-# Some VM images don't add the private interface automatically, we have to do it during the component installation
-if [[ $CLOUD_ENV == "openstack_nofloat" ]]
-then
-	#CIDR=$(cat /opt/config/oam_network_cidr.txt)
-	#BITMASK=$(echo $CIDR | cut -d"/" -f2)
-
-	# Compute the netmask based on the network cidr
-	#if [[ $BITMASK == "8" ]]
-	#then
-	#	NETMASK=255.0.0.0
-	#elif [[ $BITMASK == "16" ]]
-	#then
-	#	NETMASK=255.255.0.0
-	#elif [[ $BITMASK == "24" ]]
-	#then
-	#	NETMASK=255.255.255.0
-	#fi
-
-	echo "auto eth1" >> /etc/network/interfaces
-	#echo "iface eth1 inet static" >> /etc/network/interfaces
-	#echo "    address $DCAE_IP_ADDR" >> /etc/network/interfaces
-	#echo "    netmask $NETMASK" >> /etc/network/interfaces
-	echo "iface eth1 inet dhcp" >> /etc/network/interfaces
-	echo "    mtu $MTU" >> /etc/network/interfaces
-	ifup eth1
-fi
-
 # Download dependencies
 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
@@ -57,8 +29,8 @@ apt-get update
 apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget make openjdk-8-jdk git ntp ntpdate python python-pip
 
 # Download scripts from Nexus
-curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dcae2_vm_init.sh -o /opt/dcae2_vm_init.sh
-curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dcae2_serv.sh -o /opt/dcae2_serv.sh
+curl -k "$NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dcae2_vm_init.sh" -o /opt/dcae2_vm_init.sh
+curl -k "$NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dcae2_serv.sh" -o /opt/dcae2_serv.sh
 chmod +x /opt/dcae2_vm_init.sh
 chmod +x /opt/dcae2_serv.sh
 mv /opt/dcae2_serv.sh /etc/init.d
@@ -67,14 +39,16 @@ update-rc.d dcae2_serv.sh defaults
 # Download and install docker-engine and docker-compose
 echo "deb https://apt.dockerproject.org/repo ubuntu-xenial 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 "linux-image-extra-$(uname -r)" linux-image-extra-virtual
 apt-get install -y --allow-unauthenticated docker-engine
 
 mkdir -p /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
+curl -L "https://github.com/docker/compose/releases/download/1.9.0/docker-compose-$(uname -s)-$(uname -m)" > /opt/docker/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
+
+# 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
 DNS_FLAG=""
 if [ -s /opt/config/dns_ip_addr.txt ]
 then
@@ -90,14 +64,17 @@ cp /lib/systemd/system/docker.service /etc/systemd/system
 sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
 service docker restart
 
+
 # DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
+echo "nameserver $DNS_IP_ADDR" >> /etc/resolvconf/resolv.conf.d/head
 resolvconf -u
 
+
 # prepare the configurations needed by DCAEGEN2 installer
 rm -rf /opt/app/config
 mkdir -p /opt/app/config
 
+
 # private key
 cp /opt/config/priv_key /opt/app/config/key
 chmod 777 /opt/app/config/key
@@ -106,7 +83,6 @@ chmod 777 /opt/app/config/key
 # download blueprint input template files
 rm -rf /opt/app/inputs-templates
 mkdir -p /opt/app/inputs-templates
-#wget --no-parent -nH -r -l2 -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/
 wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/inputs.yaml
 wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/phinputs.yaml
 wget -P /opt/app/inputs-templates https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.blueprints/releases/input-templates/dhinputs.yaml
@@ -118,18 +94,6 @@ pip install jinja2
 wget https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.deployments/releases/scripts/detemplate-bpinputs.py && (python detemplate-bpinputs.py /opt/config /opt/app/inputs-templates /opt/app/config; rm detemplate-bpinputs.py)
 
 
-# Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes
-#if [[ $CLOUD_ENV != "rackspace" ]]
-#then
-#	sed -i "s/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub
-#	grub-mkconfig -o /boot/grub/grub.cfg
-#	sed -i "s/ens[0-9]*/eth0/g" /etc/network/interfaces.d/*.cfg
-#	sed -i "s/ens[0-9]*/eth0/g" /etc/udev/rules.d/70-persistent-net.rules
-#	echo 'network: {config: disabled}' >> /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
-#	echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic
-#	reboot
-#fi
-
 # Run docker containers
 cd /opt
 ./dcae2_vm_init.sh
diff --git a/boot/dcae2_serv.sh b/boot/dcae2_serv.sh
index b81c57a4..a86906a3 100644
--- a/boot/dcae2_serv.sh
+++ b/boot/dcae2_serv.sh
@@ -1,4 +1,4 @@
-
+#!/bin/sh
 #############################################################################
 #
 # Copyright © 2017 AT&T Intellectual Property. All rights reserved.
@@ -16,7 +16,6 @@
 #
 #############################################################################
 
-#!/bin/sh
 ### BEGIN INIT INFO
 # Provides:
 # Required-Start:    $remote_fs $syslog
@@ -31,7 +30,7 @@ dir="/opt"
 cmd="./dcae2_vm_init.sh"
 user="root"
 
-name=`basename $0`
+name=$(basename "$0")
 pid_file="/var/run/$name.pid"
 stdout_log="/var/log/$name.log"
 stderr_log="/var/log/$name.err"
@@ -41,8 +40,8 @@ get_pid() {
 }
 
 is_running() {
-    #[ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1
-    [ ! -z $(docker ps | grep 'org.onap.dcaegen2.deployments.bootstrap') ]
+    CID="$(docker ps | grep 'org.onap.dcaegen2.deployments.bootstrap')"
+    [ ! -z "$CID" ]
 }
 
 case "$1" in
@@ -67,9 +66,12 @@ case "$1" in
     stop)
     if is_running; then
         echo -n "Stopping $name.."
-        kill `get_pid`
+        kill "$(get_pid)"
+        CID=$(docker ps | grep 'nginx' | awk '{ print $1 }')
+        sudo docker stop "$CID"
+
         CID=$(docker ps | grep 'org.onap.dcaegen2.deployments.bootstrap' | awk '{ print $1 }')
-        docker exec -it $CID ./teardown.sh
+        docker exec -it "$CID" ./teardown.sh
         for i in {1..10}
         do
             if ! is_running; then
diff --git a/boot/dcae2_vm_init.sh b/boot/dcae2_vm_init.sh
index e27ba589..129a6d82 100644
--- a/boot/dcae2_vm_init.sh
+++ b/boot/dcae2_vm_init.sh
@@ -6,7 +6,31 @@ NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
 DOCKER_VERSION=$(cat /opt/config/docker_version.txt)
 ZONE=$(cat /opt/config/dcae_zone.txt)
 
-docker login -u $NEXUS_USER -p $NEXUS_PASSWORD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/onap/org.onap.dcaegen2.deployments.bootstrap:$DOCKER_VERSION
+
+rm -f /opt/config/runtime.ip.consul
+rm -f /opt/config/runtime.ip.cm
+
+
+docker login -u "$NEXUS_USER" -p "$NEXUS_PASSWORD" "$NEXUS_DOCKER_REPO"
+docker pull "$NEXUS_DOCKER_REPO/onap/org.onap.dcaegen2.deployments.bootstrap:$DOCKER_VERSION"
 #docker run -v /opt/config/priv_key:/opt/app/installer/config/key -v /opt/app/inputs.yaml:/opt/app/installer/config/inputs.yaml -e "LOCATION=$ZONE" $NEXUS_DOCKER_REPO/onap/org.onap.dcaegen2.deployments.bootstrap:$DOCKER_VERSION
-docker run -d --name boot -v /opt/app/config:/opt/app/installer/config -e "LOCATION=$ZONE" $NEXUS_DOCKER_REPO/onap/org.onap.dcaegen2.deployments.bootstrap:$DOCKER_VERSION
+docker run -d --name boot -v /opt/app/config:/opt/app/installer/config -e "LOCATION=$ZONE" "$NEXUS_DOCKER_REPO/onap/org.onap.dcaegen2.deployments.bootstrap:$DOCKER_VERSION"
+
+
+# waiting for bootstrap to complete then starting nginx for proxying healthcheck calls
+while [ ! -f /opt/config/runtime.ip.consul ]; do sleep 30; done
+
+# start proxy for consul's health check
+CONSULIP=$(head -1 /opt/config/runtime.ip.consul | sed 's/[[:space:]]//g')
+echo "Consul is available at $CONSULIP" 
+
+cat >./nginx.conf <<EOL
+server {
+    listen 80;
+    server_name dcae.simpledemo.onap.org;
+    location /healthcheck {
+        proxy_pass http://"${CONSULIP}":8500/v1/health/state/passing;
+    }
+}
+EOL
+sudo docker run --name dcae-proxy -p 80:80 -v "$(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf" -d nginx