summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--boot/bind_zones8
-rw-r--r--boot/bind_zones_onap8
-rw-r--r--boot/db_simpledemo_onap_org8
-rw-r--r--boot/dns_install.sh2
-rw-r--r--boot/sms_install.sh111
-rw-r--r--boot/sms_serv.sh98
-rw-r--r--boot/sms_vm_init.sh23
-rwxr-xr-xboot/vfc_vm_init.sh5
-rw-r--r--heat/OAM-Network/network.yaml17
-rw-r--r--heat/ONAP/onap_openstack.env24
-rw-r--r--heat/ONAP/onap_openstack.yaml91
-rw-r--r--heat/ONAP/onap_openstack_template.env4
12 files changed, 356 insertions, 43 deletions
diff --git a/boot/bind_zones b/boot/bind_zones
index bfdbcb54..168ed042 100644
--- a/boot/bind_zones
+++ b/boot/bind_zones
@@ -78,6 +78,7 @@ 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.aaf-sms.simpledemo.openecomp.org. IN A sms_ip_addr
vm1.mr.simpledemo.openecomp.org. IN A mr_ip_addr
@@ -103,7 +104,7 @@ aai.elasticsearch.simpledemo.openecomp.org. IN CNAME vm2.aai.simpledemo.openec
appc.api.simpledemo.openecomp.org. IN CNAME vm1.appc.simpledemo.openecomp.org.
;ASDC
-sdc.api.simpledemo.openecomp.org. IN CNAME vm1.sdc.simpledemo.openecomp.org.
+sdc.api.simpledemo.openecomp.org. IN CNAME vm1.sdc.simpledemo.openecomp.org.
;DCAE
dcae.api.simpledemo.openecomp.org. IN CNAME vm1.dcae.simpledemo.openecomp.org.
@@ -118,13 +119,13 @@ policy.api.simpledemo.openecomp.org. IN CNAME vm1.policy.simpledemo.openecomp.o
sdnc.api.simpledemo.openecomp.org. IN CNAME vm1.sdnc.simpledemo.openecomp.org.
;VID
-vid.api.simpledemo.openecomp.org. IN CNAME vm1.vid.simpledemo.openecomp.org.
+vid.api.simpledemo.openecomp.org. IN CNAME vm1.vid.simpledemo.openecomp.org.
;PORTAL
portal.api.simpledemo.openecomp.org. IN CNAME vm1.portal.simpledemo.openecomp.org.
;Message Router
-;mr.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org.
+;mr.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org.
ueb.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org.
;dbc.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org.
;drprov.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org.
@@ -138,6 +139,7 @@ sniro.api.simpledemo.openecomp.org. IN CNAME vm1.robot.simpledemo.openecomp.org.
;AAF
aaf.api.simpledemo.openecomp.org. IN CNAME vm1.aaf.simpledemo.openecomp.org.
+aaf-sms.api.simpledemo.openecomp.org. IN CNAME vm1.aaf-sms.simpledemo.openecomp.org.
;OPEN-O
msb.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org.
diff --git a/boot/bind_zones_onap b/boot/bind_zones_onap
index 7f66e4ed..2d6d5f26 100644
--- a/boot/bind_zones_onap
+++ b/boot/bind_zones_onap
@@ -78,6 +78,7 @@ c1.vm1.clamp.simpledemo.onap.org. IN A clamp_ip_addr
c2.vm1.clamp.simpledemo.onap.org. IN A clamp_ip_addr
vm1.aaf.simpledemo.onap.org. IN A aaf_ip_addr
+vm1.aaf-sms.simpledemo.onap.org. IN A sms_ip_addr
vm1.mr.simpledemo.onap.org. IN A mr_ip_addr
@@ -103,7 +104,7 @@ aai.elasticsearch.simpledemo.onap.org. IN CNAME vm2.aai.simpledemo.onap.org.
appc.api.simpledemo.onap.org. IN CNAME vm1.appc.simpledemo.onap.org.
;ASDC
-sdc.api.simpledemo.onap.org. IN CNAME vm1.sdc.simpledemo.onap.org.
+sdc.api.simpledemo.onap.org. IN CNAME vm1.sdc.simpledemo.onap.org.
;DCAE
dcae.api.simpledemo.onap.org. IN CNAME vm1.dcae.simpledemo.onap.org.
@@ -118,13 +119,13 @@ policy.api.simpledemo.onap.org. IN CNAME vm1.policy.simpledemo.onap.org.
sdnc.api.simpledemo.onap.org. IN CNAME vm1.sdnc.simpledemo.onap.org.
;VID
-vid.api.simpledemo.onap.org. IN CNAME vm1.vid.simpledemo.onap.org.
+vid.api.simpledemo.onap.org. IN CNAME vm1.vid.simpledemo.onap.org.
;PORTAL
portal.api.simpledemo.onap.org. IN CNAME vm1.portal.simpledemo.onap.org.
;Message Router
-mr.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org.
+mr.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org.
ueb.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org.
dbc.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org.
;drprov.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org.
@@ -138,6 +139,7 @@ sniro.api.simpledemo.onap.org. IN CNAME vm1.robot.simpledemo.onap.org.
;AAF
aaf.api.simpledemo.onap.org. IN CNAME vm1.aaf.simpledemo.onap.org.
+aaf-sms.api.simpledemo.onap.org. IN CNAME vm1.aaf-sms.simpledemo.onap.org.
;OPEN-O
msb.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org.
diff --git a/boot/db_simpledemo_onap_org b/boot/db_simpledemo_onap_org
index d5c3f8a5..fe1f4312 100644
--- a/boot/db_simpledemo_onap_org
+++ b/boot/db_simpledemo_onap_org
@@ -74,6 +74,7 @@ c1.vm1.robot.simpledemo.onap.org. IN A 10.0.10.1
c2.vm1.robot.simpledemo.onap.org. IN A 10.0.10.1
vm1.aaf.simpledemo.onap.org. IN A 10.0.13.1
+vm1.aaf-sms.simpledemo.onap.org. IN A 10.0.13.2
vm1.mr.simpledemo.onap.org. IN A 10.0.11.1
@@ -103,7 +104,7 @@ aai.elasticsearch.simpledemo.onap.org. IN CNAME vm2.aai.simpledemo.onap.org.
appc.api.simpledemo.onap.org. IN CNAME vm1.appc.simpledemo.onap.org.
;ASDC
-sdc.api.simpledemo.onap.org. IN CNAME vm1.sdc.simpledemo.onap.org.
+sdc.api.simpledemo.onap.org. IN CNAME vm1.sdc.simpledemo.onap.org.
;DCAE
dcae.api.simpledemo.onap.org. IN CNAME vm1.dcae.simpledemo.onap.org.
@@ -118,13 +119,13 @@ policy.api.simpledemo.onap.org. IN CNAME vm1.policy.simpledemo.onap.org.
sdnc.api.simpledemo.onap.org. IN CNAME vm1.sdnc.simpledemo.onap.org.
;VID
-vid.api.simpledemo.onap.org. IN CNAME vm1.vid.simpledemo.onap.org.
+vid.api.simpledemo.onap.org. IN CNAME vm1.vid.simpledemo.onap.org.
;PORTAL
portal.api.simpledemo.onap.org. IN CNAME vm1.portal.simpledemo.onap.org.
;Message Router
-;mr.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org.
+;mr.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org.
ueb.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org.
mr.api.simpledemo.onap.org. IN A 10.0.4.102
collector.api.simpledemo.onap.org. IN A 10.0.4.102
@@ -140,6 +141,7 @@ clamp.api.simpledemo.onap.org. IN CNAME vm1.clamp.simpledemo.onap.org.
;AAF
aaf.api.simpledemo.onap.org. IN CNAME vm1.aaf.simpledemo.onap.org.
+aaf-sms.api.simpledemo.onap.org. IN CNAME vm1.aaf-sms.simpledemo.onap.org.
;OPEN-O
msb.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org.
diff --git a/boot/dns_install.sh b/boot/dns_install.sh
index d6d18c96..52b65cf6 100644
--- a/boot/dns_install.sh
+++ b/boot/dns_install.sh
@@ -91,6 +91,7 @@ then
sed -i "s/music_ip_addr/"$(cat /opt/config/music_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
sed -i "s/oof_ip_addr/"$(cat /opt/config/oof_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
sed -i "s/aaf_ip_addr/"$(cat /opt/config/aaf_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+ sed -i "s/sms_ip_addr/"$(cat /opt/config/sms_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
sed -i "s/nbi_ip_addr/"$(cat /opt/config/nbi_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
sed -i "s/aai1_ip_addr/"$(cat /opt/config/aai1_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
@@ -111,6 +112,7 @@ then
sed -i "s/music_ip_addr/"$(cat /opt/config/music_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
sed -i "s/oof_ip_addr/"$(cat /opt/config/oof_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
sed -i "s/aaf_ip_addr/"$(cat /opt/config/aaf_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+ sed -i "s/sms_ip_addr/"$(cat /opt/config/sms_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
sed -i "s/nbi_ip_addr/"$(cat /opt/config/nbi_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
fi
diff --git a/boot/sms_install.sh b/boot/sms_install.sh
new file mode 100644
index 00000000..943ec2f3
--- /dev/null
+++ b/boot/sms_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)
+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
+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 --allow-unauthenticated -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/sms_vm_init.sh -o /opt/sms_vm_init.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/sms_serv.sh -o /opt/sms_serv.sh
+chmod +x /opt/sms_vm_init.sh
+chmod +x /opt/sms_serv.sh
+mv /opt/sms_serv.sh /etc/init.d
+update-rc.d sms_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 and run docker containers
+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
+./sms_vm_init.sh \ No newline at end of file
diff --git a/boot/sms_serv.sh b/boot/sms_serv.sh
new file mode 100644
index 00000000..7cbdab7e
--- /dev/null
+++ b/boot/sms_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="./sms_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/sms_vm_init.sh b/boot/sms_vm_init.sh
new file mode 100644
index 00000000..ee1047f3
--- /dev/null
+++ b/boot/sms_vm_init.sh
@@ -0,0 +1,23 @@
+#!/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)
+DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
+
+docker pull library/vault:0.10.0
+docker pull library/consul:1.0.6
+
+docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
+docker pull $NEXUS_DOCKER_REPO/onap/aaf/sms:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/aaf/smsquorumclient:$DOCKER_IMAGE_VERSION
+
+cd /opt/sms-service/bin/deploy
+
+#Stop existing docker containers (if any)
+if [ $(docker ps | wc -l) > 1 ]; then
+ ./sms.sh stop
+ sleep 10
+fi
+
+./sms.sh start \ No newline at end of file
diff --git a/boot/vfc_vm_init.sh b/boot/vfc_vm_init.sh
index 288404b7..e328fd8d 100755
--- a/boot/vfc_vm_init.sh
+++ b/boot/vfc_vm_init.sh
@@ -64,8 +64,5 @@ docker run -i -t -d --name vfc_ztevnfmdriver -p 8410:8410 -e MSB_ADDR=$OPENO_IP:
docker run -i -t -d --name vfc_svnfm_nokia -p 8486:8486 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$NOKIA_DOCKER_VER
docker run -i -t -d --name vfc_multivimproxy -p 8481:8481 -e MSB_ADDR=$MSB_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/multivimproxy:$MULTIVIMPROXY_DOCKER_VER
-CBAM_IP=$(cat /opt/config/cbam_ip.txt)
VNFM_ID=vnfmUuid
-CBAM_PASSWORD=$(cat /opt/config/cbam_password.txt)
-CBAM_USERNAME=$(cat /opt/config/cbam_username.txt)
-docker run -i -t -d --name vfc_svnfm_nokiav2 -p 8089:8089 -e MSB_IP=$OPENO_IP -e CONFIGURE=kuku -e EXTERNAL_IP=$OPENO_IP -e "CBAM_CATALOG_URL=https://$CBAM_IP:443/api/catalog/adapter/" -e "CBAM_LCN_URL=https://$CBAM_IP:443/vnfm/lcn/v3/" -e "CBAM_KEYCLOAK_URL=https://$CBAM_IP:443/auth/" -e "CBAM_USERNAME=$CBAM_USERNAME" -e "CBAM_PASSWORD=$CBAM_PASSWORD" -e "VNFM_ID=$VNFM_ID" -d --stop-timeout 300 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokiav2:$NOKIAV2_DOCKER_VER
+docker run -i -t -d --name vfc_svnfm_nokiav2 -p 8089:8089 -e MSB_IP=$OPENO_IP -e CONFIGURE=kuku -e EXTERNAL_IP=$OPENO_IP -e "VNFM_ID=$VNFM_ID" -d --stop-timeout 300 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokiav2:$NOKIAV2_DOCKER_VER
diff --git a/heat/OAM-Network/network.yaml b/heat/OAM-Network/network.yaml
new file mode 100644
index 00000000..cdfb2d79
--- /dev/null
+++ b/heat/OAM-Network/network.yaml
@@ -0,0 +1,17 @@
+heat_template_version: 2013-05-23
+
+resources:
+
+ # ONAP management private network
+ oam_onap:
+ type: OS::Neutron::Net
+ properties:
+ name: oam_onap_vnf_test
+
+ oam_onap_subnet:
+ type: OS::Neutron::Subnet
+ properties:
+ name: oam_onap_vnf_test
+ network_id: { get_resource: oam_onap }
+ cidr: 10.0.0.0/16
+ enable_dhcp: false
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 5c12403b..e8866af1 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -92,6 +92,7 @@ parameters:
music_ip_addr: 10.0.15.1
oof_ip_addr: 10.0.16.1
aaf_ip_addr: 10.0.13.1
+ sms_ip_addr: 10.0.13.2
nbi_ip_addr: 10.0.17.1
###########################
@@ -135,13 +136,14 @@ parameters:
music_branch: master
nbi_branch: master
aaf_branch: master
+ sms_branch: master
oof_branch: master
aai_docker: 1.2-STAGING-latest
aai_sparky_docker: 1.2-STAGING-latest
appc_docker: 1.3.0-SNAPSHOT-latest
so_docker: 1.2.1
- policy_docker: 1.2.0
+ policy_docker: v1.2.0
portal_docker: 2.1-STAGING-latest
robot_docker: 1.2-STAGING-latest
sdc_docker: 1.2-STAGING-latest
@@ -149,7 +151,7 @@ parameters:
vid_docker: 1.2.1
clamp_docker: 2.0-STAGING-latest
msb_docker: 1.1.0-STAGING-latest
- mvim_docker: 1.1.0-SNAPSHOT
+ mvim_docker: 1.1.2-SNAPSHOT
mvim_openstack_docker: 1.1.2-SNAPSHOT
uui_docker: 1.1.0-SNAPSHOT-STAGING-latest
esr_docker: 1.1.0-SNAPSHOT
@@ -159,6 +161,7 @@ parameters:
music_docker: latest
oof_docker: latest
aaf_docker: 2.1.0-SNAPSHOT
+ sms_docker: latest
nbi_docker: latest
dbcl_docker: latest
@@ -178,8 +181,8 @@ parameters:
dcae_sch_docker: latest
dcae_heartbeat_docker: latest
dcae_prh_docker: latest
- holmes_rm_docker: v1.0.0
- holmes_em_docker: v1.0.0
+ holmes_rm_docker: latest
+ holmes_em_docker: latest
vfc_nokia_docker: 1.1.0-STAGING-latest
vfc_nokiav2_docker: 1.1.0-STAGING-latest
@@ -199,16 +202,6 @@ parameters:
vfc_wfengine_activiti_docker: latest
vfc_multivimproxy_docker: 1.0.0-STAGING-latest
- ############################################
- # #
- # Parameters used by Nokia v2 SVNFM driver #
- # #
- ############################################
-
- cbam_username: onapUsername #PUT USERNAME REGISTERED INTO THE NOKIA VNFM, LEAVE AS IS IF NOT USING NOKIA SVNFM
- cbam_password: onapPassword #PUT PASSWORD REGISTERED INTO THE NOKIA VNFM, LEAVE AS IS IF NOT USING NOKIA SVNFM
- cbam_ip: kuku #PUT THE NOKIA VNFM IP ADDRESS HERE, LEAVE AS IS IF NOT USING NOKIA SVNFM
-
#####################
# #
# ONAP repositories #
@@ -216,7 +209,7 @@ parameters:
#####################
aai_repo: http://gerrit.onap.org/r/aai/test-config
appc_repo: http://gerrit.onap.org/r/appc/deployment.git
- mr_repo: http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git
+ mr_repo: http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git
so_repo: http://gerrit.onap.org/r/so/docker-config.git
policy_repo: http://gerrit.onap.org/r/policy/docker.git
portal_repo: http://gerrit.onap.org/r/portal.git
@@ -229,4 +222,5 @@ parameters:
music_repo: http://gerrit.onap.org/r/music.git
nbi_repo: http://gerrit.onap.org/r/externalapi/nbi.git
aaf_repo: http://gerrit.onap.org/r/aaf/authz.git
+ sms_repo: http://gerrit.onap.org/r/aaf/sms.git
oof_repo: http://gerrit.onap.org/r/optf/has.git
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index c9b51727..ddc5dd0e 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -207,6 +207,8 @@ parameters:
type: string
aaf_ip_addr:
type: string
+ sms_ip_addr:
+ type: string
nbi_ip_addr:
type: string
@@ -300,6 +302,8 @@ parameters:
type: string
aaf_repo:
type: string
+ sms_repo:
+ type: string
oof_repo:
type: string
@@ -426,6 +430,8 @@ parameters:
type: string
aaf_docker:
type: string
+ sms_docker:
+ type: string
nbi_docker:
type: string
dbcl_docker:
@@ -466,13 +472,6 @@ parameters:
vfc_multivimproxy_docker:
type: string
- cbam_username:
- type: string
- cbam_password:
- type: string
- cbam_ip:
- type: string
-
aai_branch:
type: string
appc_branch:
@@ -503,6 +502,8 @@ parameters:
type: string
aaf_branch:
type: string
+ sms_branch:
+ type: string
oof_branch:
type: string
@@ -649,6 +650,7 @@ resources:
__music_ip_addr__: { get_param: music_ip_addr }
__oof_ip_addr__: { get_param: oof_ip_addr }
__aaf_ip_addr__: { get_param: aaf_ip_addr }
+ __sms_ip_addr__: { get_param: sms_ip_addr }
__nbi_ip_addr__: { get_param: nbi_ip_addr }
__cloud_env__: { get_param: cloud_env }
__external_dns__: { get_param: external_dns }
@@ -680,6 +682,7 @@ resources:
echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt
echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt
echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt
+ echo "__sms_ip_addr__" > /opt/config/sms_ip_addr.txt
echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt
echo "__external_dns__" > /opt/config/external_dns.txt
echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt
@@ -1686,9 +1689,6 @@ resources:
__vnfsdk_repo__: { get_param: vnfsdk_repo }
__vfc_nokia_docker__: { get_param: vfc_nokia_docker }
__vfc_nokiav2_docker__: { get_param: vfc_nokiav2_docker }
- __cbam_ip__: { get_param: cbam_ip }
- __cbam_username__: { get_param: cbam_username }
- __cbam_password__: { get_param: cbam_password }
__vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
__vfc_multivimproxy_docker__: { get_param: vfc_multivimproxy_docker }
__vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker }
@@ -1725,9 +1725,6 @@ resources:
echo "__uui_docker__" > /opt/config/uui_docker.txt
echo "__esr_docker__" > /opt/config/esr_docker.txt
echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt
- echo "__cbam_ip__" > /opt/config/cbam_ip.txt
- echo "__cbam_username__" > /opt/config/cbam_username.txt
- echo "__cbam_password__" > /opt/config/cbam_password.txt
echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt
echo "export NOKIAV2_DOCKER_VER=__vfc_nokiav2_docker__" >> /opt/config/vfc_docker.txt
@@ -2185,6 +2182,74 @@ resources:
chmod +x aaf_install.sh
./aaf_install.sh
+ # SMS instantiation
+ sms_private_port:
+ type: OS::Neutron::Port
+ properties:
+ network: { get_resource: oam_onap }
+ fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: sms_ip_addr }}]
+ security_groups:
+ - { get_resource: onap_sg }
+
+ sms_floating_ip:
+ type: OS::Neutron::FloatingIP
+ properties:
+ floating_network_id: { get_param: public_net_id }
+ port_id: { get_resource: sms_private_port }
+
+ sms_vm:
+ type: OS::Nova::Server
+ properties:
+ image: { get_param: ubuntu_1604_image }
+ flavor: { get_param: flavor_medium }
+ name:
+ str_replace:
+ template: base-sms
+ params:
+ base: { get_param: vm_base_name }
+ key_name: { get_resource: vm_key }
+ networks:
+ - port: { get_resource: sms_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 }
+ __artifacts_version__: { get_param: artifacts_version }
+ __dns_ip_addr__: { get_param: dns_ip_addr }
+ __docker_version__: { get_param: sms_docker }
+ __cloud_env__: { get_param: cloud_env }
+ __external_dns__: { get_param: external_dns }
+ __sms_repo__: { get_param: sms_repo }
+ __gerrit_branch__: { get_param: sms_branch }
+ __local_ip__: { get_param: sms_ip_addr }
+ 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 "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+ echo "__docker_version__" > /opt/config/docker_version.txt
+ echo "__cloud_env__" > /opt/config/cloud_env.txt
+ echo "__external_dns__" > /opt/config/external_dns.txt
+ echo "__sms_repo__" > /opt/config/remote_repo.txt
+ echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+ echo "__local_ip__" > /opt/config/local_ip.txt
+
+ # Download and run install script
+ curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sms_install.sh -o /opt/sms_install.sh
+ cd /opt
+ chmod +x sms_install.sh
+ ./sms_install.sh
+
# NBI instantiation
nbi_private_port:
type: OS::Neutron::Port
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index b81cc67f..6b11df00 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -150,7 +150,7 @@ parameters:
clamp_docker: ${CLAMP_DOCKER}
msb_docker: ${MSB_APIGATEWAY_DOCKER}
mvim_docker: ${FRAMEWORK_DOCKER}
- mvim_openstack_docker: ${MC_OPENSTACK_DOCKER}
+ mvim_openstack_docker: ${OPENSTACK_OCATA_DOCKER}
uui_docker: ${USECASE_UI_SERVER_DOCKER}
esr_docker: ${ESR_SERVER_DOCKER}
sdc_wfd_docker: ${SDC_WORKFLOW_DESIGNER_DOCKER}
@@ -160,7 +160,7 @@ parameters:
oof_docker: ${OOF_DOCKER}
aaf_docker: ${AAF_DOCKER}
nbi_docker: ${NBI_DOCKER}
- dbcl_docker: ${DBCL_DOCKER}
+ dbcl_docker: ${BUSCONTROLLER_DOCKER}
dcae_docker: ${BOOTSTRAP_DOCKER}
dcae_snmptrap_docker: ${SNMPTRAP_DOCKER}