From 569b54f0659cc790c0c9c2eec3a72884b6162626 Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Tue, 29 Aug 2017 10:38:08 -0400 Subject: Add CLAMP VM to ONAP - Extend Heat templates with CLAMP resources definition - Create installation scripts for CLAMP - Update DNS configuration Change-Id: I1db7f884f8318eceb74dace972f8ad808ac8551d Issue-ID: INT-115 Signed-off-by: Marco Platania --- boot/bind_zones | 9 +++- boot/clamp_install.sh | 111 +++++++++++++++++++++++++++++++++++++++ boot/clamp_serv.sh | 98 ++++++++++++++++++++++++++++++++++ boot/clamp_vm_init.sh | 12 +++++ boot/db_simpledemo_openecomp_org | 11 +++- boot/dns_install.sh | 1 + 6 files changed, 239 insertions(+), 3 deletions(-) create mode 100644 boot/clamp_install.sh create mode 100644 boot/clamp_serv.sh create mode 100644 boot/clamp_vm_init.sh (limited to 'boot') diff --git a/boot/bind_zones b/boot/bind_zones index 01d8128c..83b9f873 100644 --- a/boot/bind_zones +++ b/boot/bind_zones @@ -69,9 +69,13 @@ vm1.portal.simpledemo.openecomp.org. IN A portal_ip_addr c1.vm1.portal.simpledemo.openecomp.org. IN A portal_ip_addr c2.vm1.portal.simpledemo.openecomp.org. IN A portal_ip_addr +vm1.clamp.simpledemo.openecomp.org. IN A clamp_ip_addr +c1.vm1.clamp.simpledemo.openecomp.org. IN A clamp_ip_addr +c2.vm1.clamp.simpledemo.openecomp.org. IN A clamp_ip_addr + ;vm1.aaf.simpledemo.openecomp.org. IN A aaf_ip_addr -vm1.mr.simpledemo.openecomp.org. IN A mr_ip_addr +vm1.mr.simpledemo.openecomp.org. IN A mr_ip_addr ;CNAMES @@ -115,5 +119,8 @@ collector.api.simpledemo.openecomp.org. IN A dcae_coll_ip_addr ;dbc.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org. ;drprov.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org. +CLAMP +clamp.api.simpledemo.openecomp.org. IN CNAME vm1.clamp.simpledemo.openecomp.org. + ;AAF ;aaf.api.simpledemo.openecomp.org. IN CNAME vm1.aaf.simpledemo.openecomp.org. diff --git a/boot/clamp_install.sh b/boot/clamp_install.sh new file mode 100644 index 00000000..03af2301 --- /dev/null +++ b/boot/clamp_install.sh @@ -0,0 +1,111 @@ +#!/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) +OPENSTACK_API_KEY=$(cat /opt/config/openstack_api_key.txt) +GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) +MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) +CODE_REPO=$(cat /opt/config/remote_repo.txt) + +# 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/clamp_vm_init.sh -o /opt/clamp_vm_init.sh +curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/clamp_serv.sh -o /opt/clamp_serv.sh +chmod +x /opt/clamp_vm_init.sh +chmod +x /opt/clamp_serv.sh +mv /opt/clamp_serv.sh /etc/init.d +update-rc.d clamp_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 --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 + +# Clone Gerrit repository +cd /opt +git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO + +# 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. For openstack Ubuntu 16.04 images this will run as a service after the VM has restarted +./clamp_vm_init.sh diff --git a/boot/clamp_serv.sh b/boot/clamp_serv.sh new file mode 100644 index 00000000..ed311849 --- /dev/null +++ b/boot/clamp_serv.sh @@ -0,0 +1,98 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start daemon at boot time +# Description: Enable service provided by daemon. +### END INIT INFO + +dir="/opt" +cmd="./clamp_vm_init.sh" +user="root" + +name=`basename $0` +pid_file="/var/run/$name.pid" +stdout_log="/var/log/$name.log" +stderr_log="/var/log/$name.err" + +get_pid() { + cat "$pid_file" +} + +is_running() { + [ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1 +} + +case "$1" in + start) + if is_running; then + echo "Already started" + else + echo "Starting $name" + cd "$dir" + if [ -z "$user" ]; then + sudo $cmd >> "$stdout_log" 2>> "$stderr_log" & + else + sudo -u "$user" $cmd >> "$stdout_log" 2>> "$stderr_log" & + fi + echo $! > "$pid_file" + if ! is_running; then + echo "Unable to start, see $stdout_log and $stderr_log" + exit 1 + fi + fi + ;; + stop) + if is_running; then + echo -n "Stopping $name.." + kill `get_pid` + for i in {1..10} + do + if ! is_running; then + break + fi + + echo -n "." + sleep 1 + done + echo + + if is_running; then + echo "Not stopped; may still be shutting down or shutdown may have failed" + exit 1 + else + echo "Stopped" + if [ -f "$pid_file" ]; then + rm "$pid_file" + fi + fi + else + echo "Not running" + fi + ;; + restart) + $0 stop + if is_running; then + echo "Unable to stop, will not attempt to start" + exit 1 + fi + $0 start + ;; + status) + if is_running; then + echo "Running" + else + echo "Stopped" + exit 1 + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; +esac + +exit 0 diff --git a/boot/clamp_vm_init.sh b/boot/clamp_vm_init.sh new file mode 100644 index 00000000..997e5566 --- /dev/null +++ b/boot/clamp_vm_init.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) +NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) +NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) +DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt) +OPENSTACK_USERNAME=$(cat /opt/config/openstack_username.txt) +OPENSTACK_APIKEY=$(cat /opt/config/api_key.txt) + +# Fetch the latest code/scripts +cd /opt/clamp +git pull diff --git a/boot/db_simpledemo_openecomp_org b/boot/db_simpledemo_openecomp_org index 4209bfe0..65c8265f 100644 --- a/boot/db_simpledemo_openecomp_org +++ b/boot/db_simpledemo_openecomp_org @@ -69,9 +69,13 @@ vm1.portal.simpledemo.openecomp.org. IN A 10.0.9.1 c1.vm1.portal.simpledemo.openecomp.org. IN A 10.0.9.1 c2.vm1.portal.simpledemo.openecomp.org. IN A 10.0.9.1 -vm1.aaf.simpledemo.openecomp.org. IN A 10.0.12.1 +vm1.aaf.simpledemo.openecomp.org. IN A 10.0.13.1 -vm1.mr.simpledemo.openecomp.org. IN A 10.0.11.1 +vm1.mr.simpledemo.openecomp.org. IN A 10.0.11.1 + +vm1.clamp.simpledemo.openecomp.org. IN A 10.0.12.1 +c1.vm1.clamp.simpledemo.openecomp.org. IN A 10.0.12.1 +c2.vm1.clamp.simpledemo.openecomp.org. IN A 10.0.12.1 ;CNAMES @@ -115,5 +119,8 @@ collector.api.simpledemo.openecomp.org. IN A 10.0.4.102 ;dbc.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org. ;drprov.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org. +CLAMP +clamp.api.simpledemo.openecomp.org. IN CNAME vm1.clamp.simpledemo.openecomp.org. + ;AAF aaf.api.simpledemo.openecomp.org. IN CNAME vm1.aaf.simpledemo.openecomp.org. diff --git a/boot/dns_install.sh b/boot/dns_install.sh index e76f371a..48c402c8 100644 --- a/boot/dns_install.sh +++ b/boot/dns_install.sh @@ -79,6 +79,7 @@ then sed -i "s/sdnc_ip_addr/"$(cat /opt/config/sdnc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org sed -i "s/vid_ip_addr/"$(cat /opt/config/vid_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org sed -i "s/dcae_coll_ip_addr/"$(cat /opt/config/dcae_coll_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org + sed -i "s/clamp_ip_addr/"$(cat /opt/config/clamp_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org fi # Configure Bind -- cgit 1.2.3-korg