Add AAI searchservice entry to DNS configuration

- Add the searchservice entry to DNS zone file
- Rename aai2_* install/init scripts to aai_*
- Point Heat template to aai_* scripts

Change-Id: Ife73688cdc2cf01dc9aa89d8b91db79eea6ea15b
Issue-ID: AAI-128
Signed-off-by: Marco Platania <platania@research.att.com>

1 files changed, 0 insertions, 110 deletions

diff --git a/boot/aai2_install.sh b/boot/aai2_install.sh
deleted file mode 100644
index d2708018..00000000
--- a/boot/aai2_install.sh
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/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)
-GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-AAI_INSTANCE=$(cat /opt/config/aai_instance.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
-
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-	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
-	LOCAL_IP=$(cat /opt/config/local_ip_addr.txt)
-	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 $LOCAL_IP" >> /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
-apt-get update
-apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make
-
-# Download scripts from Nexus
-curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/aai2_vm_init.sh -o /opt/aai2_vm_init.sh
-curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/aai2_serv.sh -o /opt/aai2_serv.sh
-chmod +x /opt/aai2_vm_init.sh
-chmod +x /opt/aai2_serv.sh
-mv /opt/aai2_serv.sh /etc/init.d
-update-rc.d aai2_serv.sh defaults
-
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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 --allow-unauthenticated docker-engine
-
-mkdir /opt/docker
-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
-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
-	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
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
-# Run docker containers
-cd /opt
-git clone -b $GERRIT_BRANCH --single-branch http://gerrit.onap.org/r/aai/test-config
-
-if [[ $AAI_INSTANCE == "aai_instance_1" ]]
-then
-	mkdir -p /opt/aai/logroot/AAI-RESOURCES
-	mkdir -p /opt/aai/logroot/AAI-TRAVERSAL
-	mkdir -p /opt/aai/logroot/AAI-ML
-	mkdir -p /opt/aai/logroot/AAI-SDB
-	mkdir -p /opt/aai/logroot/AAI-DRMS
-	mkdir -p /opt/aai/logroot/AAI-UI
-	chown -R 999:999 /opt/aai/logroot/AAI-RESOURCES /opt/aai/logroot/AAI-TRAVERSAL
-
-	sleep 300
-fi
-
-./aai2_vm_init.sh
\ No newline at end of file