summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--boot/aai2_install.sh105
-rw-r--r--boot/aai2_serv.sh98
-rw-r--r--boot/aai2_vm_init.sh16
-rw-r--r--boot/db_simpledemo_openecomp_org9
-rw-r--r--heat/OpenECOMP/onap_rackspace.yaml91
5 files changed, 308 insertions, 11 deletions
diff --git a/boot/aai2_install.sh b/boot/aai2_install.sh
new file mode 100644
index 00000000..631b8e3a
--- /dev/null
+++ b/boot/aai2_install.sh
@@ -0,0 +1,105 @@
+#!/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
+
+# Download scripts from Nexus
+curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/aai_vm_init.sh -o /opt/aai_vm_init.sh
+curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/aai_serv.sh -o /opt/aai_serv.sh
+chmod +x /opt/aai_vm_init.sh
+chmod +x /opt/aai_serv.sh
+mv /opt/aai_serv.sh /etc/init.d
+update-rc.d aai_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
+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
+fi
+
+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
+
+ sleep 300
+fi
+
+./aai_vm_init.sh \ No newline at end of file
diff --git a/boot/aai2_serv.sh b/boot/aai2_serv.sh
new file mode 100644
index 00000000..add00097
--- /dev/null
+++ b/boot/aai2_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="./aai2_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/aai2_vm_init.sh b/boot/aai2_vm_init.sh
new file mode 100644
index 00000000..ffe0955f
--- /dev/null
+++ b/boot/aai2_vm_init.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+AAI_INSTANCE=$(cat /opt/config/aai_instance.txt)
+
+cd /opt/test-config
+git pull
+
+if [[ $AAI_INSTANCE == "aai_instance_1" ]]
+then
+ ./deploy_vm1.sh
+elif [[ $AAI_INSTANCE == "aai_instance_2" ]]
+then
+ ./deploy_vm2.sh
+else
+ echo "Invalid instance. Exiting..."
+fi
diff --git a/boot/db_simpledemo_openecomp_org b/boot/db_simpledemo_openecomp_org
index 5b5d418c..dfa7e6ad 100644
--- a/boot/db_simpledemo_openecomp_org
+++ b/boot/db_simpledemo_openecomp_org
@@ -21,6 +21,11 @@ c1.vm1.aai.simpledemo.openecomp.org. IN A 10.0.1.1
c2.vm1.aai.simpledemo.openecomp.org. IN A 10.0.1.1
c3.vm1.aai.simpledemo.openecomp.org. IN A 10.0.1.1
+vm2.aai.simpledemo.openecomp.org. IN A 10.0.1.2
+c1.vm2.aai.simpledemo.openecomp.org. IN A 10.0.1.2
+c2.vm2.aai.simpledemo.openecomp.org. IN A 10.0.1.2
+c3.vm2.aai.simpledemo.openecomp.org. IN A 10.0.1.2
+
vm1.appc.simpledemo.openecomp.org. IN A 10.0.2.1
c1.vm1.appc.simpledemo.openecomp.org. IN A 10.0.2.1
c2.vm1.appc.simpledemo.openecomp.org. IN A 10.0.2.1
@@ -72,7 +77,9 @@ vm1.mr.simpledemo.openecomp.org. IN A 10.0.11.1
;CNAMES
;A&AI
aai.api.simpledemo.openecomp.org. IN CNAME vm1.aai.simpledemo.openecomp.org.
-aai.hbase.simpledemo.openecomp.org. IN CNAME vm1.aai.simpledemo.openecomp.org.
+aai.hbase.simpledemo.openecomp.org. IN CNAME vm2.aai.simpledemo.openecomp.org.
+aai.gremlinserver.simpledemo.openecomp.org. IN CNAME vm2.aai.simpledemo.openecomp.org.
+aai.elasticsearch.simpledemo.openecomp.org. IN CNAME vm2.aai.simpledemo.openecomp.org.
;APPC
appc.api.simpledemo.openecomp.org. IN CNAME vm1.appc.simpledemo.openecomp.org.
diff --git a/heat/OpenECOMP/onap_rackspace.yaml b/heat/OpenECOMP/onap_rackspace.yaml
index 4c27fad7..bfcad835 100644
--- a/heat/OpenECOMP/onap_rackspace.yaml
+++ b/heat/OpenECOMP/onap_rackspace.yaml
@@ -246,14 +246,14 @@ resources:
./dns_install.sh
- # A&AI instantiation
- aai_private_port:
+ # A&AI instantiation (2 VMs)
+ aai1_private_port:
type: OS::Neutron::Port
properties:
network: { get_resource: oam_ecomp }
fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.1.1}]
- aai_volume:
+ aai1_volume:
type: OS::Cinder::Volume
properties:
name: vol1-aai
@@ -261,22 +261,23 @@ resources:
volume_type: SSD
image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
- aai_vm:
+ aai1_vm:
type: OS::Nova::Server
+ depends_on: aai2_vm
properties:
flavor: 15 GB Compute v1
name:
str_replace:
- template: base-aai
+ template: base-aai-inst1
params:
base: { get_param: vm_base_name }
key_name: { get_resource: vm_key }
block_device_mapping:
- - volume_id: { get_resource: aai_volume }
+ - volume_id: { get_resource: aai1_volume }
device_name: vda
networks:
- network: { get_param: public_net_id }
- - port: { get_resource: aai_private_port }
+ - port: { get_resource: aai1_private_port }
user_data_format: RAW
user_data:
str_replace:
@@ -288,6 +289,7 @@ resources:
__dmaap_topic__: { get_param: dmaap_topic }
__artifacts_version__: { get_param: artifacts_version }
__docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
__cloud_env__: { get_param: cloud_env }
template: |
#!/bin/bash
@@ -302,13 +304,82 @@ resources:
echo "10.0.0.1" > /opt/config/dns_ip_addr.txt
echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
echo "__docker_version__" > /opt/config/docker_version.txt
+ echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+ echo "aai_instance_1" > /opt/config/aai_instance.txt
+ echo "__cloud_env__" > /opt/config/cloud_env.txt
+
+ # Download and run install script
+ curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai2_install.sh -o /opt/aai2_install.sh
+ cd /opt
+ chmod +x aai2_install.sh
+ ./aai2_install.sh
+
+
+ aai2_private_port:
+ type: OS::Neutron::Port
+ properties:
+ network: { get_resource: oam_ecomp }
+ fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.1.2}]
+
+ aai2_volume:
+ type: OS::Cinder::Volume
+ properties:
+ name: vol2-aai
+ size: 50
+ volume_type: SSD
+ image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
+
+ aai2_vm:
+ type: OS::Nova::Server
+ properties:
+ flavor: 15 GB Compute v1
+ name:
+ str_replace:
+ template: base-aai-inst2
+ params:
+ base: { get_param: vm_base_name }
+ key_name: { get_resource: vm_key }
+ block_device_mapping:
+ - volume_id: { get_resource: aai2_volume }
+ device_name: vda
+ networks:
+ - network: { get_param: public_net_id }
+ - port: { get_resource: aai2_private_port }
+ user_data_format: RAW
+ user_data:
+ str_replace:
+ params:
+ __nexus_repo__: { get_param: nexus_repo }
+ __nexus_docker_repo__: { get_param: nexus_docker_repo }
+ __nexus_username__: { get_param: nexus_username }
+ __nexus_password__: { get_param: nexus_password }
+ __dmaap_topic__: { get_param: dmaap_topic }
+ __artifacts_version__: { get_param: artifacts_version }
+ __docker_version__: { get_param: docker_version }
+ __gerrit_branch__: { get_param: gerrit_branch }
+ __cloud_env__: { get_param: cloud_env }
+ template: |
+ #!/bin/bash
+
+ # Create configuration files
+ mkdir -p /opt/config
+ echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+ echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
+ echo "__nexus_username__" > /opt/config/nexus_username.txt
+ echo "__nexus_password__" > /opt/config/nexus_password.txt
+ echo "__artifacts_version__" > /opt/config/artifacts_version.txt
+ echo "10.0.0.1" > /opt/config/dns_ip_addr.txt
+ echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
+ echo "__docker_version__" > /opt/config/docker_version.txt
+ echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+ echo "aai_instance_2" > /opt/config/aai_instance.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
# Download and run install script
- curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
+ curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai2_install.sh -o /opt/aai2_install.sh
cd /opt
- chmod +x aai_install.sh
- ./aai_install.sh
+ chmod +x aai2_install.sh
+ ./aai2_install.sh
# MSO instantiation