Clean old ONAP heat template from demo repository 09/86309/1
authormrichomme <morgan.richomme@orange.com>
Thu, 25 Apr 2019 16:24:19 +0000 (18:24 +0200)
committermrichomme <morgan.richomme@orange.com>
Thu, 25 Apr 2019 16:24:19 +0000 (18:24 +0200)
this template is not maintained since casablanca.
People could be surprised to find it here (still available on casablanca or older branches)

Issue-ID: INT-1046

Change-Id: I266ccc59c05a713cde17b20491f2e729d068414f
Signed-off-by: mrichomme <morgan.richomme@orange.com>
45 files changed:
heat/ONAP/cloud-config/.env [deleted file]
heat/ONAP/cloud-config/aaf_install.sh [deleted file]
heat/ONAP/cloud-config/aaf_vm_init.sh [deleted file]
heat/ONAP/cloud-config/aai_install.sh [deleted file]
heat/ONAP/cloud-config/aai_vm_init.sh [deleted file]
heat/ONAP/cloud-config/appc_install.sh [deleted file]
heat/ONAP/cloud-config/appc_vm_init.sh [deleted file]
heat/ONAP/cloud-config/clamp_install.sh [deleted file]
heat/ONAP/cloud-config/clamp_vm_init.sh [deleted file]
heat/ONAP/cloud-config/cli_install.sh [deleted file]
heat/ONAP/cloud-config/dbcl_vm_init.sh [deleted file]
heat/ONAP/cloud-config/dcae2_install.sh [deleted file]
heat/ONAP/cloud-config/dns_install.sh [deleted file]
heat/ONAP/cloud-config/docker-compose.yml [deleted file]
heat/ONAP/cloud-config/mr_install.sh [deleted file]
heat/ONAP/cloud-config/mr_vm_init.sh [deleted file]
heat/ONAP/cloud-config/multiserv_install.sh [deleted file]
heat/ONAP/cloud-config/music_install.sh [deleted file]
heat/ONAP/cloud-config/music_vm_init.sh [deleted file]
heat/ONAP/cloud-config/nbi_install.sh [deleted file]
heat/ONAP/cloud-config/nbi_vm_init.sh [deleted file]
heat/ONAP/cloud-config/oof_install.sh [deleted file]
heat/ONAP/cloud-config/oof_vm_init.sh [deleted file]
heat/ONAP/cloud-config/policy_install.sh [deleted file]
heat/ONAP/cloud-config/policy_vm_init.sh [deleted file]
heat/ONAP/cloud-config/portal_install.sh [deleted file]
heat/ONAP/cloud-config/portal_vm_init.sh [deleted file]
heat/ONAP/cloud-config/robot_install.sh [deleted file]
heat/ONAP/cloud-config/robot_vm_init.sh [deleted file]
heat/ONAP/cloud-config/sdc_install.sh [deleted file]
heat/ONAP/cloud-config/sdc_vm_init.sh [deleted file]
heat/ONAP/cloud-config/sdnc_install.sh [deleted file]
heat/ONAP/cloud-config/sdnc_vm_init.sh [deleted file]
heat/ONAP/cloud-config/serv.sh [deleted file]
heat/ONAP/cloud-config/sms_install.sh [deleted file]
heat/ONAP/cloud-config/sms_vm_init.sh [deleted file]
heat/ONAP/cloud-config/so_install.sh [deleted file]
heat/ONAP/cloud-config/so_vm_init.sh [deleted file]
heat/ONAP/cloud-config/vid_install.sh [deleted file]
heat/ONAP/cloud-config/vid_vm_init.sh [deleted file]
heat/ONAP/manifest-to-env.sh [deleted file]
heat/ONAP/onap_openstack.env [deleted file]
heat/ONAP/onap_openstack.yaml [deleted file]
heat/ONAP/onap_openstack_template.env [deleted file]
heat/ONAP/openstack_encrypted_key.sh [deleted file]

diff --git a/heat/ONAP/cloud-config/.env b/heat/ONAP/cloud-config/.env
deleted file mode 100644 (file)
index cbf25f8..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-TAG=latest
-REGISTRY=nexus3.onap.org:10001/
-CS_HOST=yyy
-CS_AUTHENTICATE=true
-CS_USER=asdc_user
-CS_PASSWORD=Aa1234%^!
-WF_BE_INIT_CS_PORT=9160
-WF_BE_JAVA_OPTIONS=-Xdebug -agentlib:jdwp=transport=dt_socket,address=7001,server=y,suspend=n -Xmx1536m -Xms1536m
-WF_BE_CS_PORT=9042
-WF_BE_DEBUG_PORT=7001
-SDC_PROTOCOL=HTTP
-SDC_HOST=yyy
-SDC_USER=workflow
-SDC_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-WF_FE_JAVA_OPTIONS=-Xdebug -agentlib:jdwp=transport=dt_socket,address=7000,server=y,suspend=n -Xmx1536m -Xms1536m
-WF_FE_HOST_PORT=8184
-WF_FE_DEBUG_PORT=7000
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/aaf_install.sh b/heat/ONAP/cloud-config/aaf_install.sh
deleted file mode 100644 (file)
index 90bc6f6..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-CURRENT_DIR=$(pwd)
-export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
-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)
-AAF_DOCKER_VERSION=$(cat /opt/config/docker_version.txt)
-docker login -u $NEXUS_USERNAME -p "$NEXUS_PASSWD" $NEXUS_DOCKER_REPO
-
-if [ -e "/opt/authz" ]; then
-  cd /opt/authz
-  git pull
-else
-  cd /opt
-  git clone https://gerrit.onap.org/r/aaf/authz
-  cd authz
-fi
-cd $CURRENT_DIR
-
-docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_config:$AAF_DOCKER_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_cm:$AAF_DOCKER_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_fs:$AAF_DOCKER_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_gui:$AAF_DOCKER_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_hello:$AAF_DOCKER_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_locate:$AAF_DOCKER_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_oauth:$AAF_DOCKER_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_service:$AAF_DOCKER_VERSION
-/bin/bash ./aaf_vm_init.sh 
-
diff --git a/heat/ONAP/cloud-config/aaf_vm_init.sh b/heat/ONAP/cloud-config/aaf_vm_init.sh
deleted file mode 100644 (file)
index 6d4fa28..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-CURRENT_DIR=$(pwd)
-
-if [ ! -e /opt/authz/auth/docker/d.props ]; then
-  cp /opt/authz/auth/docker/d.props.init /opt/authz/auth/docker/d.props
-fi
-
-
-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)
-sed -i "s/DOCKER_REPOSITORY=.*/DOCKER_REPOSITORY=$NEXUS_DOCKER_REPO/" /opt/authz/auth/docker/d.props
-. /opt/authz/auth/docker/d.props
-
-HOSTNAME=`hostname -f`
-FQDN=aaf.api.simpledemo.onap.org
-HOST_IP=$(cat /opt/config/public_ip.txt)
-
-CASS_IP=`docker inspect aaf_cass | grep '"IPAddress' | head -1 | cut -d '"' -f 4`
-CASS_HOST="cass.aaf.osaaf.org:"$CASS_IP
-cd /opt/authz/auth/auth-cass/docker
-if [ "`docker container ls | grep aaf_cass`" = "" ]; then
-  # Cassandra Install
-  echo Cassandra Install
-  bash ./dinstall.sh
-fi
-
-CASS_IP=`docker inspect aaf_cass | grep '"IPAddress' | head -1 | cut -d '"' -f 4`
-CASS_HOST="cass.aaf.osaaf.org:"$CASS_IP
-if [ ! -e /opt/authz/auth/docker/cass.props ]; then
-  cp /opt/authz/auth/docker/cass.props.init /opt/authz/auth/docker/cass.props
-fi
-
-sed -i "s/CASS_HOST=.*/CASS_HOST="$CASS_HOST"/g" /opt/authz/auth/docker/cass.props
-# TODO Pull from Config Dir
-if [ "$LATITUDE" = "" ]; then
-  LATITUDE=37.781
-  LONGITUDE=-122.261
-  sed -i "s/LATITUDE=.*/LATITUDE=$LATITUDE/g" /opt/authz/auth/docker/d.props
-  sed -i "s/LONGITUDE=.*/LONGITUDE=$LONGITUDE/g" /opt/authz/auth/docker/d.props
-fi
-
-sed -i "s/VERSION=.*/VERSION=$VERSION/g" /opt/authz/auth/docker/d.props
-sed -i "s/HOSTNAME=.*/HOSTNAME=$HOSTNAME/g" /opt/authz/auth/docker/d.props
-sed -i "s/HOST_IP=.*/HOST_IP=$HOST_IP/g" /opt/authz/auth/docker/d.props
-sed -i "s/AAF_REGISTER_AS=.*/AAF_REGISTER_AS=$FQDN/g" /opt/authz/auth/docker/d.props
-
-cd /opt/authz/auth/docker
-# Need new Deployment system properties
-bash ./aaf.sh
-
-# run it
-bash ./drun.sh
diff --git a/heat/ONAP/cloud-config/aai_install.sh b/heat/ONAP/cloud-config/aai_install.sh
deleted file mode 100644 (file)
index 774b45a..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# Read configuration files
-GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-AAI_INSTANCE=$(cat /opt/config/aai_instance.txt)
-CODE_REPO=$(cat /opt/config/remote_repo.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-# Run docker containers
-cd /opt
-git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
-
-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
-
-./aai_vm_init.sh
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/aai_vm_init.sh b/heat/ONAP/cloud-config/aai_vm_init.sh
deleted file mode 100644 (file)
index ffe0955..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/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/heat/ONAP/cloud-config/appc_install.sh b/heat/ONAP/cloud-config/appc_install.sh
deleted file mode 100644 (file)
index 8c680ee..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Read configuration files
-GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-CODE_REPO=$(cat /opt/config/remote_repo.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-# Clone Gerrit repository and run docker containers
-cd /opt
-git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO appc
-./appc_vm_init.sh
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/appc_vm_init.sh b/heat/ONAP/cloud-config/appc_vm_init.sh
deleted file mode 100644 (file)
index 8c14398..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
-NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
-export NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
-DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt)
-DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
-ANSIBLE_DOCKER_IMAGE_VERSION=$(cat /opt/config/ansible_version.txt)
-DGBUILDER_IMAGE_VERSION=$(cat /opt/config/dgbuilder_version.txt)
-export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
-
-cd /opt/appc
-git pull
-cd /opt/appc/docker-compose
-
-sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="$DMAAP_TOPIC"/g" docker-compose.yml
-
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-
-docker pull $NEXUS_DOCKER_REPO/onap/appc-image:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/appc-image:$DOCKER_IMAGE_VERSION onap/appc-image:latest
-
-
-docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-ansible-server-image:$ANSIBLE_DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-ansible-server-image:$ANSIBLE_DOCKER_IMAGE_VERSION onap/ccsdk-ansible-server-image:latest
-
-docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$DGBUILDER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$DGBUILDER_IMAGE_VERSION onap/ccsdk-dgbuilder-image:latest
-
-docker pull $NEXUS_DOCKER_REPO/onap/appc-cdt-image:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/appc-cdt-image:$DOCKER_IMAGE_VERSION onap/appc-cdt-image:latest
-
-/opt/docker/docker-compose up -d
diff --git a/heat/ONAP/cloud-config/clamp_install.sh b/heat/ONAP/cloud-config/clamp_install.sh
deleted file mode 100644 (file)
index 653be90..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Read configuration files
-GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-CODE_REPO=$(cat /opt/config/remote_repo.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-# Clone Gerrit repository and run docker containers
-cd /opt
-git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
-./clamp_vm_init.sh
diff --git a/heat/ONAP/cloud-config/clamp_vm_init.sh b/heat/ONAP/cloud-config/clamp_vm_init.sh
deleted file mode 100644 (file)
index 3b73051..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/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)
-
-# Fetch the latest code/scripts
-cd /opt/clamp
-git pull
-
-# Remove unused folders as only extra/ folder is used for docker compose
-rm -rf pom.xml
-rm -rf src/
-
-# No configuration change here as directly done in the CLAMP repo
-
-# Pull the clamp docker image from nexus
-# Maria db will be pulled automatically from docker.io during docker-compose
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-
-docker pull $NEXUS_DOCKER_REPO/onap/clamp:$DOCKER_IMAGE_VERSION
-
-cd extra/docker/heat/
-
-# Change the Clamp docker image name in the docker-compose.yml to match the one downloaded
-for image in "onap/clamp" "onap/clamp-dashboard-elasticsearch" "onap/clamp-dashboard-logstash" "onap/clamp-dashboard-kibana"
-do
-    sed -i "s@image: $image:latest@image: $NEXUS_DOCKER_REPO/$image:$DOCKER_IMAGE_VERSION@g" docker-compose.yml
-done
-
-# Ensure max_map_count is high enough for elasticsearch
-sysctl -w vm.max_map_count=262144
-echo "sysctl -w vm.max_map_count=262144" >> /etc/sysctl.conf
-
-# Start Clamp and MariaDB containers with docker compose and clamp/extra/docker/clamp/docker-compose.yml
-/opt/docker/docker-compose up -d
diff --git a/heat/ONAP/cloud-config/cli_install.sh b/heat/ONAP/cloud-config/cli_install.sh
deleted file mode 100644 (file)
index 4593c68..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-#*******************************************************************************
-# Copyright 2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#*******************************************************************************
-
-CLI_LATEST_BINARY="https://nexus.onap.org/content/repositories/releases/org/onap/cli/cli-zip/1.1.0/cli-zip-1.1.0.zip"
-CLI_INSTALL_DIR=/opt/onap/cli
-CLI_ZIP=cli.zip
-CLI_BIN=/usr/bin/onap
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-export ONAP_CLI_HOME=$CLI_INSTALL_DIR
-export CLI_PRODUCT_VERSION=onap-1.1
-
-#create install dir
-if [ -d $CLI_INSTALL_DIR ]
-then
-    mv $CLI_INSTALL_DIR $CLI_INSTALL_DIR/../cli_`date +"%m-%d-%y-%H-%M-%S"`
-    rm $CLI_BIN
-fi
-
-mkdir -p $CLI_INSTALL_DIR
-cd $CLI_INSTALL_DIR
-
-#Download and unzip CLI
-apt-get install -y wget unzip
-
-#check for java
-java -version
-if [ $? == 127 ]
-then
-    apt-get install -y openjdk-8-jre
-fi
-
-wget -O $CLI_ZIP $CLI_LATEST_BINARY
-
-unzip $CLI_ZIP
-if [ ! -d ./data ]; then mkdir ./data; fi
-if [ ! -d ./onap-cli-schema ]; then mkdir ./onap-cli-schema; fi
-chmod +x ./bin/onap.sh
-
-#Make onap available in path
-ln ./bin/onap.sh $CLI_BIN
-
-#Print the version
-onap -v
-
-cd -
diff --git a/heat/ONAP/cloud-config/dbcl_vm_init.sh b/heat/ONAP/cloud-config/dbcl_vm_init.sh
deleted file mode 100644 (file)
index 08cc3f1..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-
-# Establish environment variables
-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)
-
-# Refresh images
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/onap/dmaap/buscontroller:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/dmaap/buscontroller:$DOCKER_IMAGE_VERSION onap/dmaap/buscontroller:latest
-
-docker rm -f dmaap-buscontroller
-
-TMP_CFG=/tmp/docker-dmaap-buscontroller.conf
-cat >> $TMP_CFG <<!EOF
-DMAAPBC_INT_HTTPS_PORT=8443
-DMAAPBC_PG_ENABLED=false
-DMAAPBC_INSTANCE_NAME=ONAP-CSIT
-DMAAPBC_AAF_URL=https://aaf.api.simpledemo.onap.org:8095/proxy/
-DMAAPBC_MR_CNAME=mr.api.simpledemo.onap.org
-DMAAPBC_DRPROV_FQDN=drprov.simpledemo.onap.org
-DMAAPBC_KSTOREPASS="Perish the thought"
-DMAAPBC_PVTKEYPASS="Perish the thought"
-!EOF
-
-# Insert docker run instructions here
-docker run -i -t -d --name dmaap-buscontroller -p 8080:8080 -p 8443:8443 -v $TMP_CFG:/opt/app/config/conf $NEXUS_DOCKER_REPO/onap/dmaap/buscontroller:$DOCKER_IMAGE_VERSION
-
-sleep 15
-
-DBCL_FQDN=dbc.api.simpledemo.onap.org
-DRPS_FQDN=drprov.simpledemo.onap.org
-MR_FQDN=mr.api.simpledemo.onap.org
-# INITIALIZE: dmaap object
-JSON=/tmp/$$.dmaap
-cat << EOF > $JSON
-{
-"version": "1",
-"topicNsRoot": "org.onap.dmaap",
-"drProvUrl": "http://${DRPS_FQDN}:8080",
-"dmaapName": "onapStable",
-"bridgeAdminTopic": "MM_AGENT_PROV"
-
-}
-EOF
-
-curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://${DBCL_FQDN}:8080/webapi/dmaap 
-
-
-
-# INITIALIZE: dcaeLocation object
-JSON=/tmp/$$.loc
-cat << EOF > $JSON
-{
-"dcaeLocationName": "csit-sanfrancisco",
-"dcaeLayer": "central-cloud",
-"clli": "STABLE2345",
-"zone": "zoneA"
-
-}
-EOF
-
-curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://${DBCL_FQDN}:8080/webapi/dcaeLocations 
-
-
-# INITIALIZE: MR object in 1 site
-# Note: the values in the hosts[] are fictitious, and anticipate a 
-# future MR cluster deployment.
-JSON=/tmp/$$.mrc
-cat << EOF > $JSON
-{
-"dcaeLocationName": "stable-sanfrancisco",
-"fqdn": "${MR_FQDN}",
-"hosts" : [ 
-       "mrhost1.simpledemo.onap.org", 
-       "mrhost2.simpledemo.onap.org", 
-       "mrhost3.simpledemo.onap.org" 
-       ],
-"protocol" : "https",
-"port": "3094"
-
-}
-EOF
-
-curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://${DBCL_FQDN}:8080/webapi/mr_clusters
diff --git a/heat/ONAP/cloud-config/dcae2_install.sh b/heat/ONAP/cloud-config/dcae2_install.sh
deleted file mode 100644 (file)
index f7866fd..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-#############################################################################
-#
-# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#############################################################################
-
-set -ex 
-
-# add well-known DCAE hostname aliases
-echo "$(cat /opt/config/dcae_ip_addr.txt) consul" >>/etc/hosts
-echo "$(cat /opt/config/dcae_ip_addr.txt) dockerhost" >>/etc/hosts
-
-# Read configuration files
-EXTERNAL_DNS=$(cat /opt/config/external_dns.txt)
-MAC_ADDR=$(cat /opt/config/mac_addr.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-
-# Download dependencies
-apt-get update
-apt-get install -y python python-pip
-
-# Download scripts from Nexus
-cp /opt/boot/dcae2_vm_init.sh /opt/dcae2_vm_init.sh
-chmod +x /opt/dcae2_vm_init.sh
-
-DOCKER_OPTS=$(cat /etc/default/docker | grep ^DOCKER_OPTS)
-DOCKER_OPTS=${DOCKER_OPTS::-1}" --raw-logs -H tcp://0.0.0.0:2376 -H unix:///var/run/docker.sock\""
-sed -i "s|DOCKER_OPTS=.*|DOCKER_OPTS=$DOCKER_OPTS|g" /etc/default/docker
-
-#echo "DOCKER_OPTS=\" $DOCKER_OPTS --raw-logs -H tcp://0.0.0.0:2376 -H unix:///var/run/docker.sock\" " >> /etc/default/docker
-sed -i "/ExecStart/s/$/ -H tcp:\/\/0.0.0.0:2376 --raw-logs/g" /etc/systemd/system/docker.service
-if [ ! -e /etc/docker/daemon.json ]; then
-  REGISTRY="$(cat /opt/config/nexus_docker_repo.txt)"
-  if [[ $REGISTRY != nexus3.onap.org* ]]; then
-    echo "{  \"insecure-registries\" : [\"${REGISTRY}\"] }" > /etc/docker/daemon.json
-  fi
-fi
-systemctl daemon-reload
-service docker restart
-
-# prepare the configurations needed by DCAEGEN2 installer
-rm -rf /opt/app/config
-mkdir -p /opt/app/config
-
-
-cd /opt
-./dcae2_vm_init.sh &>/dev/null &disown
diff --git a/heat/ONAP/cloud-config/dns_install.sh b/heat/ONAP/cloud-config/dns_install.sh
deleted file mode 100644 (file)
index ca6f560..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/bash
-
-# Read configuration files
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       # Set the Bind configuration file name based on the deployment environment
-       ZONE_FILE="bind_zones"
-       ZONE_ONAP="bind_zones_onap"
-       OPTIONS_FILE="bind_options"
-else
-       ZONE_FILE="db_simpledemo_openecomp_org"
-       ZONE_ONAP="db_simpledemo_onap_org"
-       OPTIONS_FILE="named.conf.options"
-fi
-
-apt-get install -y bind9 bind9utils bind9-doc
-
-# Download script
-mkdir /etc/bind/zones
-cp /opt/boot/$ZONE_FILE /etc/bind/zones/db.simpledemo.openecomp.org
-cp /opt/boot/$ZONE_ONAP /etc/bind/zones/db.simpledemo.onap.org
-cp /opt/boot/$OPTIONS_FILE /etc/bind/named.conf.options
-cp /opt/boot/named.conf.local /etc/bind/named.conf.local
-
-# Set the private IP address of each ONAP VM in the Bind configuration in OpenStack deployments
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-    sed -i "s/dns_forwarder/"$(cat /opt/config/dns_forwarder.txt)"/g" /etc/bind/named.conf.options
-       sed -i "s/dns_ip_addr/"$(cat /opt/config/dns_ip_addr.txt)"/g" /etc/bind/named.conf.options
-       sed -i "s/external_dns/"$(cat /opt/config/external_dns.txt)"/g" /etc/bind/named.conf.options
-       sed -i "s/aai1_ip_addr/"$(cat /opt/config/aai1_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-       sed -i "s/aai2_ip_addr/"$(cat /opt/config/aai2_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-       sed -i "s/appc_ip_addr/"$(cat /opt/config/appc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-       sed -i "s/dcae_ip_addr/"$(cat /opt/config/dcae_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-       sed -i "s/dns_ip_addr/"$(cat /opt/config/dns_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-       sed -i "s/so_ip_addr/"$(cat /opt/config/so_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-       sed -i "s/mr_ip_addr/"$(cat /opt/config/mr_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-       sed -i "s/policy_ip_addr/"$(cat /opt/config/policy_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-       sed -i "s/portal_ip_addr/"$(cat /opt/config/portal_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-       sed -i "s/robot_ip_addr/"$(cat /opt/config/robot_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-       sed -i "s/sdc_ip_addr/"$(cat /opt/config/sdc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-       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/clamp_ip_addr/"$(cat /opt/config/clamp_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-       sed -i "s/multiserv_ip_addr/"$(cat /opt/config/multiserv_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-       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
-       sed -i "s/aai2_ip_addr/"$(cat /opt/config/aai2_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
-       sed -i "s/appc_ip_addr/"$(cat /opt/config/appc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
-       sed -i "s/dcae_ip_addr/"$(cat /opt/config/dcae_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
-       sed -i "s/dns_ip_addr/"$(cat /opt/config/dns_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
-       sed -i "s/so_ip_addr/"$(cat /opt/config/so_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
-       sed -i "s/mr_ip_addr/"$(cat /opt/config/mr_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
-       sed -i "s/policy_ip_addr/"$(cat /opt/config/policy_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
-       sed -i "s/portal_ip_addr/"$(cat /opt/config/portal_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
-       sed -i "s/robot_ip_addr/"$(cat /opt/config/robot_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
-       sed -i "s/sdc_ip_addr/"$(cat /opt/config/sdc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
-       sed -i "s/sdnc_ip_addr/"$(cat /opt/config/sdnc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
-       sed -i "s/vid_ip_addr/"$(cat /opt/config/vid_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
-       sed -i "s/clamp_ip_addr/"$(cat /opt/config/clamp_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
-       sed -i "s/multiserv_ip_addr/"$(cat /opt/config/multiserv_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
-       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
-
-# Configure Bind
-modprobe ip_gre
-sed -i "s/OPTIONS=.*/OPTIONS=\"-4 -u bind\"/g" /etc/default/bind9
-service bind9 restart
-
diff --git a/heat/ONAP/cloud-config/docker-compose.yml b/heat/ONAP/cloud-config/docker-compose.yml
deleted file mode 100644 (file)
index 4aedf61..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-version: '3'
-services:
-  
-  workflow-cassandra-init:
-    image: "${REGISTRY}onap/workflow-init:${TAG}"  
-    environment:
-        - CS_HOST=${CS_HOST}
-        - CS_AUTHENTICATE
-        - CS_USER
-        - CS_PASSWORD
-        - CS_PORT=${WF_BE_INIT_CS_PORT}
-
-  workflow-backend:
-    depends_on:
-      - workflow-cassandra-init
-    image: "${REGISTRY}onap/workflow-backend:${TAG}"
-    ports:
-        - "5603:5603"
-        - "${WF_BE_DEBUG_PORT}:${WF_BE_DEBUG_PORT}"
-    environment:
-        - JAVA_OPTIONS=${WF_BE_JAVA_OPTIONS}
-        - CS_HOSTS=${CS_HOST}
-        - CS_USER
-        - CS_PASSWORD
-        - CS_PORT=${WF_BE_CS_PORT}
-        - SDC_PROTOCOL
-        - SDC_ENDPOINT="${SDC_HOST}:8080"
-        - SDC_USER
-        - SDC_PASSWORD
-
-  workflow-frontend:
-    depends_on:
-      - workflow-cassandra-init
-      - workflow-backend
-    image: "${REGISTRY}onap/workflow-frontend:${TAG}"
-    ports:
-        - "${WF_FE_HOST_PORT}:8080"
-        - "${WF_FE_DEBUG_PORT}:${WF_FE_DEBUG_PORT}"
-    environment:
-        - JAVA_OPTIONS=${WF_FE_JAVA_OPTIONS}
-        - BACKEND=http://workflow-backend:8080
diff --git a/heat/ONAP/cloud-config/mr_install.sh b/heat/ONAP/cloud-config/mr_install.sh
deleted file mode 100644 (file)
index be49b97..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Read configuration files
-GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-CODE_REPO=$(cat /opt/config/remote_repo.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-# Clone Gerrit repository and run docker containers
-cd /opt
-git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO /opt/startup-vm-message-router
-./mr_vm_init.sh
diff --git a/heat/ONAP/cloud-config/mr_vm_init.sh b/heat/ONAP/cloud-config/mr_vm_init.sh
deleted file mode 100644 (file)
index 78d61f8..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
-
-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 login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-
-cd /opt/startup-vm-message-router/demo
-sed -i 's|wget .*|wget -q \"http://archive.apache.org/dist/kafka/${KAFKA_VERSION}/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz\" \\|g' deploy.sh
-bash deploy.sh &>/dev/null &disown
-
-cd /opt
-bash dbcl_vm_init.sh &>/dev/null &disown
diff --git a/heat/ONAP/cloud-config/multiserv_install.sh b/heat/ONAP/cloud-config/multiserv_install.sh
deleted file mode 100644 (file)
index 0487172..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# Read configuration files
-VNFSDK_BRANCH=$(cat /opt/config/vnfsdk_branch.txt)
-VNFSDK_REPO=$(cat /opt/config/vnfsdk_repo.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-# Download dependencies
-apt-get update
-apt-get install -y mysql-client-core-5.6
-
-# Download scripts from Nexus
-cp /opt/boot/vnfsdk_vm_init.sh /opt/vnfsdk_vm_init.sh
-cp /opt/boot/msb_vm_init.sh /opt/msb_vm_init.sh
-cp /opt/boot/mvim_vm_init.sh /opt/mvim_vm_init.sh
-cp /opt/boot/vfc_vm_init.sh /opt/vfc_vm_init.sh
-cp /opt/boot/uui_vm_init.sh /opt/uui_vm_init.sh
-cp /opt/boot/multiserv_all_serv.sh /opt/multiserv_all_serv.sh
-cp /opt/boot/esr_vm_init.sh /opt/esr_vm_init.sh
-chmod +x /opt/vnfsdk_vm_init.sh
-chmod +x /opt/msb_vm_init.sh
-chmod +x /opt/mvim_vm_init.sh
-chmod +x /opt/vfc_vm_init.sh
-chmod +x /opt/uui_vm_init.sh
-chmod +x /opt/multiserv_all_serv.sh
-chmod +x /opt/esr_vm_init.sh
-
-# Clone Gerrit repository and run docker containers
-cd /opt
-git clone -b $VNFSDK_BRANCH --single-branch $VNFSDK_REPO
-source ./cli_install.sh
-./multiserv_all_serv.sh
diff --git a/heat/ONAP/cloud-config/music_install.sh b/heat/ONAP/cloud-config/music_install.sh
deleted file mode 100644 (file)
index 42cc01a..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Read configuration files
-GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-CODE_REPO=$(cat /opt/config/remote_repo.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-# Clone Gerrit repository and run docker containers
-cd /opt
-git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
-./music_vm_init.sh
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/music_vm_init.sh b/heat/ONAP/cloud-config/music_vm_init.sh
deleted file mode 100644 (file)
index 2241ed1..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/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/zookeeper:3.4
-docker pull library/tomcat:8.5
-
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/onap/music/cassandra_music:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/music/music:$DOCKER_IMAGE_VERSION
-
-cd /opt/music/distribution/dockermusic
-git pull
-
-#Stop existing docker containers (if any)
-if [ $(docker ps | wc -l) > 1 ]; then
-       ./music.sh stop
-       sleep 2
-fi
-
-./music.sh start
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/nbi_install.sh b/heat/ONAP/cloud-config/nbi_install.sh
deleted file mode 100644 (file)
index d7fce0f..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# Read configuration files
-GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-CODE_REPO=$(cat /opt/config/remote_repo.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-# Run docker containers
-cd /opt
-./nbi_vm_init.sh
diff --git a/heat/ONAP/cloud-config/nbi_vm_init.sh b/heat/ONAP/cloud-config/nbi_vm_init.sh
deleted file mode 100644 (file)
index a285634..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Set environment variables
-export DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
-NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
-NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
-export NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
-export SDC_IP=$(cat /opt/config/sdc_ip_addr.txt)
-export AAI_IP=$(cat /opt/config/aai_ip_addr.txt)
-export SO_IP=$(cat /opt/config/so_ip_addr.txt)
-
-# Create nbi directory
-mkdir -p /opt/nbi
-cd /opt/nbi
-
-# Create .env file to access env variables for docker-compose
-echo "SDC_IP=${SDC_IP}" > .env
-echo "SO_IP=${SO_IP}" >> .env
-echo "AAI_IP=${AAI_IP}" >> .env
-echo "NEXUS_DOCKER_REPO=${NEXUS_DOCKER_REPO}" >> .env
-
-# Fetch the latest docker-compose.yml
-curl -o docker-compose.yml https://git.onap.org/externalapi/nbi/plain/docker-compose.yml?h=master
-
-# Pull the nbi docker image from nexus
-# MariaDB and mongoDB will be pulled automatically from docker.io during docker-compose
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-
-docker pull $NEXUS_DOCKER_REPO/onap/externalapi/nbi:$DOCKER_IMAGE_VERSION
-
-# Start nbi, MariaDB and MongoDB containers with docker compose and nbi/docker-compose.yml
-/opt/docker/docker-compose up -d
diff --git a/heat/ONAP/cloud-config/oof_install.sh b/heat/ONAP/cloud-config/oof_install.sh
deleted file mode 100644 (file)
index c86aad8..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Read configuration files
-GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-CODE_REPO=$(cat /opt/config/remote_repo.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-# Clone Gerrit repository and run docker containers
-cd /opt
-git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO optf-has
-./oof_vm_init.sh
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/oof_vm_init.sh b/heat/ONAP/cloud-config/oof_vm_init.sh
deleted file mode 100644 (file)
index 47a34e8..0000000
+++ /dev/null
@@ -1,283 +0,0 @@
-#!/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)
-CASS_MUSIC_IMAGE_VERSION=$(cat /opt/config/cass_version.txt)
-MUSIC_IMAGE_VERSION=$(cat /opt/config/music_version.txt)
-HAS_IMAGE_VERSION=$(cat /opt/config/has_docker_version.txt)
-OSDF_IMAGE_VERSION=$(cat /opt/config/osdf_docker_version.txt)
-
-cd /opt/optf-has
-git pull
-
-COND_CONF=/opt/optf-has/conductor.conf
-LOG_CONF=/opt/optf-has/log.conf
-
-# Certification file for OOF-HAS
-AAI_cert=/usr/local/bin/AAF_RootCA.cer
-BUNDLE=/opt/optf-has/AAF_RootCA.cer
-
-OSDF_IMG=${NEXUS_DOCKER_REPO}/onap/optf-osdf:${OSDF_IMAGE_VERSION}
-HAS_IMG=${NEXUS_DOCKER_REPO}/onap/optf-has:${HAS_IMAGE_VERSION}
-
-# pull OOF images from repo
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull ${OSDF_IMG}
-docker pull ${HAS_IMG}
-
-# Install MUSIC
-# MUSIC parameters
-CASS_IMG=${NEXUS_DOCKER_REPO}/onap/music/cassandra_music:$CASS_MUSIC_IMAGE_VERSION
-MUSIC_IMG=${NEXUS_DOCKER_REPO}/onap/music/music:$MUSIC_IMAGE_VERSION
-TOMCAT_IMG=library/tomcat:8.5
-ZK_IMG=library/zookeeper:3.4
-WORK_DIR=/opt/optf-has
-CASS_USERNAME=cassandra1
-CASS_PASSWORD=cassandra1
-
-# pull MUSIC images
-docker pull ${ZK_IMG}
-docker pull ${TOMCAT_IMG}
-docker pull ${CASS_IMG}
-docker pull ${MUSIC_IMG}
-
-# create directory for music properties and logs
-mkdir -p /opt/optf-has/music/properties
-mkdir -p /opt/optf-has/music/logs
-
-# add music.properties file
-cat > /opt/optf-has/music/properties/music.properties<<NEWFILE
-my.id=0
-all.ids=0
-my.public.ip=localhost
-all.public.ips=localhost
-
-#######################################
-
-# Optional current values are defaults
-
-#######################################
-zookeeper.host=music-zk
-cassandra.host=music-db
-#music.ip=localhost
-#debug=true
-#music.rest.ip=localhost
-#lock.lease.period=6000
-cassandra.user=cassandra1
-cassandra.password=cassandra1
-
-# AAF Endpoint if using AAF
-aaf.endpoint.url=https://aaf.api.simpledemo.onap.org
-NEWFILE
-
-# Create Volume for mapping war file and tomcat
-docker volume create music-vol
-
-# Create a network for all the containers to run in.
-docker network create music-net
-
-# Start Cassandra
-docker run -d --rm --name music-db --network music-net -p "7000:7000" -p "7001:7001" -p "7199:7199" -p "9042:9042" -p "9160:9160" -e CASSUSER=${CASS_USERNAME} -e CASSPASS=${CASS_PASSWORD} ${CASS_IMG}
-
-# Start Music war
-docker run -d --rm --name music-war -v music-vol:/app ${MUSIC_IMG}
-
-# Start Zookeeper
-docker run -d --rm --name music-zk --network music-net -p "2181:2181" -p "2888:2888" -p "3888:3888" ${ZK_IMG}
-
-# Delay for Cassandra
-sleep 20;
-
-# Start Up tomcat - Needs to have properties,logs dir and war file volume mapped.
-docker run -d --rm --name music-tomcat --network music-net -p "8080:8080" -v music-vol:/usr/local/tomcat/webapps -v ${WORK_DIR}/music/properties:/opt/app/music/etc:ro -v ${WORK_DIR}/music/logs:/opt/app/music/logs ${TOMCAT_IMG}
-
-# Connect tomcat to host bridge network so that its port can be seen.
-docker network connect bridge music-tomcat;
-sleep 6;
-echo "Running onboarding curl command"
-curl -X POST \
-  http://localhost:8080/MUSIC/rest/v2/admin/onboardAppWithMusic \
-  -H 'Cache-Control: no-cache' \
-  -H 'Content-Type: application/json' \
-  -H 'Postman-Token: 7d2839f4-b032-487a-8998-4d1b27a932d7' \
-  -d '{
-"appname": "conductor",
-"userId" : "conductor",
-"isAAF"  : false,
-"password" : "c0nduct0r"
-}
-'
-echo "Onboarding curl complete"
-
-# Get MUSIC url
-MUSIC_URL=$(docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-tomcat)
-
-# Run OOF-HAS
-# Set A&AI and MUSIC url inside OOF-HAS conductor.conf
-sed -i "147 s%.*%aaf_url = http://aaf.api.simpledemo.onap.org:8100/authz/perms/user/%" $COND_CONF
-sed -i "167 s%.*%aaf_sms_url = http://aaf-sms.api.simpledemo.onap.org:10443%" $COND_CONF
-sed -i "202 s%.*%server_url = https://aai.api.simpledemo.onap.org:8443/aai%" $COND_CONF
-sed -i "211 s%.*%server_url_version = v14%" $COND_CONF
-sed -i "382 s%.*%server_url = http://msb.api.simpledemo.onap.org/api/multicloud%" $COND_CONF
-sed -i "401 s%.*%server_url = http://$MUSIC_URL:8080/MUSIC/rest/v2%" $COND_CONF
-sed -i "433 s%.*%replication_factor = 1%" $COND_CONF
-sed -i "536 s%.*%server_url = https://sdnc.api.simpledemo.onap.org:8282/restconf/%" $COND_CONF
-
-# Set A&AI and SMS authentication file locations inside OOF-HAS conductor.conf
-sed -i "174 s%.*%aaf_ca_certs = $AAI_cert%" $COND_CONF
-sed -i "225 s%.*%certificate_authority_bundle_file = $AAI_cert%" $COND_CONF
-
-
-echo "Values to data component"
-echo $BUNDLE
-
-# run optf-has
-docker run -d --name controller -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${HAS_IMG} python /usr/local/bin/conductor-controller --config-file=/usr/local/bin/conductor.conf
-
-docker run -d --name api -p "8091:8091" -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${HAS_IMG} python /usr/local/bin/conductor-api --port=8091 -- --config-file=/usr/local/bin/conductor.conf
-
-docker run -d --name solver -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${HAS_IMG} python /usr/local/bin/conductor-solver --config-file=/usr/local/bin/conductor.conf
-
-docker run -d --name reservation -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf ${HAS_IMG} python /usr/local/bin/conductor-reservation --config-file=/usr/local/bin/conductor.conf
-
-docker run -d --name data -v $COND_CONF:/usr/local/bin/conductor.conf -v $LOG_CONF:/usr/local/bin/log.conf -v $BUNDLE:/usr/local/bin/AAF_RootCA.cer ${HAS_IMG} python /usr/local/bin/conductor-data --config-file=/usr/local/bin/conductor.conf
-
-sleep 10
-
-echo "Inserting healthcheck plan"
-
-curl -X POST \
-  http://$MUSIC_URL:8080/MUSIC/rest/v2/keyspaces/conductor/tables/plans/rows/ \
-  -H 'Cache-Control: no-cache' \
-  -H 'Content-Type: application/json' \
-  -H 'Postman-Token: 502781e8-d588-475d-b181-c2e26625ac95' \
-  -H 'X-minorVersion: 3' \
-  -H 'X-patchVersion: 0' \
-  -H 'ns: conductor' \
-  -H 'password: c0nduct0r' \
-  -H 'userId: conductor' \
-  -d '{
-    "consistencyInfo": {
-        "type": "eventual"
-    },
-    "values": {
-        "id" : "healthcheck",
-        "created": 1479482603641,
-        "message": "",
-        "name": "foo",
-        "recommend_max": 1,
-        "solution": "{\"healthcheck\": \" healthcheck\"}",
-        "status": "done",
-        "template": "{\"healthcheck\": \"healthcheck\"}",
-        "timeout": 3600,
-        "translation": "{\"healthcheck\": \" healthcheck\"}",
-        "updated": 1484324150629
-    }
-}
-'
-
-echo "Healthcheck plan inserted"
-
-
-#run optf-osdf
-OSDF_CONFIG=/opt/optf-osdf/config/osdf_config.yaml
-HAS_HOST=$(docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' api)
-
-mkdir -p /opt/optf-osdf/config
-
-cat > $OSDF_CONFIG<<NEWFILE
-
-placementVersioningEnabled: False
-
-# Placement API latest version numbers to be set in HTTP header
-placementMajorVersion: "1"
-placementMinorVersion: "0"
-placementPatchVersion: "0"
-
-# Placement API default version numbers to be set in HTTP header
-placementDefaultMajorVersion: "1"
-placementDefaultMinorVersion: "0"
-placementDefaultPatchVersion: "0"
-
-# Credentials for SO
-soUsername: ""   # SO username for call back.
-soPassword: ""   # SO password for call back.
-
-# Credentials for Conductor
-conductorUrl: http://$HAS_HOST:8091/v1/plans/
-conductorUsername: admin1
-conductorPassword: plan.15
-conductorPingWaitTime: 60  # seconds to wait before calling the conductor retry URL
-conductorMaxRetries: 30  # if we don't get something in 30 minutes, give up
-# versions to be set in HTTP header
-conductorMinorVersion: 0
-
-# Policy Platform -- requires ClientAuth, Authorization, and Environment
-policyPlatformUrl: http://policy.api.simpledemo.onap.org:8081/pdp/api/getConfig # Policy Dev platform URL
-policyPlatformEnv: TEST  # Environment for policy platform
-policyPlatformUsername: testpdp   # Policy platform username.
-policyPlatformPassword: alpha123   # Policy platform password.
-policyClientUsername: python   # For use with ClientAuth
-policyClientPassword: test   # For use with ClientAuth
-
-# Credentials for DMaaP
-messageReaderHosts: NA
-messageReaderTopic: NA
-messageReaderAafUserId: NA
-messageReaderAafPassword: NA
-
-# Credentials for SDC
-sdcUrl: NA
-sdcUsername: NA
-sdcPassword: NA
-sdcONAPInstanceID: NA
-
-# Credentials for the OOF placement service - Generic
-osdfPlacementUsername: test
-osdfPlacementPassword: testpwd
-
-# Credentials for the OOF placement service - SO
-osdfPlacementSOUsername: so_test
-osdfPlacementSOPassword: so_testpwd
-
-# Credentials for the OOF placement service - VFC
-osdfPlacementVFCUsername: vfc_test
-osdfPlacementVFCPassword: vfc_testpwd
-
-# Credentials for the OOF CM scheduling service - Generic
-osdfCMSchedulerUsername: test1
-osdfCMSchedulerPassword: testpwd1
-
-is_aaf_enabled: False
-aaf_cache_expiry_hrs: 3
-aaf_url: https://aaf.api.simpledemo.onap.org:8100
-aaf_user_roles:
-    - /api/oof/v1/placement:org.onap.osdf.access|*|read ALL
-
-# Secret Management Service from AAF
-aaf_sms_url: https://aaf-sms.api.simpledemo.onap.org:10443
-aaf_sms_timeout: 30
-secret_domain: osdf
-aaf_ca_certs: ssl_certs/aaf_root_ca.cer
-
-# config db api
-configDbUrl: http://config.db.url:8080
-configDbUserName: osdf
-configDbPassword: passwd
-configDbGetCellListUrl: 'SDNCConfigDBAPI/getCellList'
-configDbGetNbrListUrl: 'SDNCConfigDBAPI/getNbrList'
-
-# Credentials for PCIHandler
-pciHMSUsername: ""   # pcihandler username for call back.
-pciHMSPassword: ""   # pcihandler password for call back.
-
-# Credentials for the OOF PCI Opt service
-osdfPCIOptUsername: pci_test
-osdfPCIOptPassword: pci_testpwd
-
-
-NEWFILE
-
-docker run -d --name osdf -v $OSDF_CONFIG:/opt/app/config/osdf_config.yaml -p 8698:8699 ${OSDF_IMG}
diff --git a/heat/ONAP/cloud-config/policy_install.sh b/heat/ONAP/cloud-config/policy_install.sh
deleted file mode 100644 (file)
index 362b582..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Read configuration files
-GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-CODE_REPO=$(cat /opt/config/remote_repo.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-# Clone Gerrit repository and run docker containers
-cd /opt
-git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO policy
-./policy_vm_init.sh
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/policy_vm_init.sh b/heat/ONAP/cloud-config/policy_vm_init.sh
deleted file mode 100644 (file)
index 1281840..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-# destroy running instances if any
-
-for container in $(docker ps -q)
-do
-       echo "stopping container ${container}"
-       docker stop "${container}"
-done
-
-for container in $(docker ps -a -q)
-do
-       echo "removing container ${container}"
-       docker rm -v "${container}"
-done
-
-# remove dangling resources
-
-for volume in $(docker volume ls -qf dangling=true)
-do
-       echo "removing volume ${volume}"
-       docker volume rm "${volume}"
-done
-
-for image in $(docker images -f dangling=true -q)
-do
-       echo "removing image ${image}"
-       docker rmi "${image}"
-done
-
-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)
-export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
-export DOCKER_REPOSITORY=${NEXUS_DOCKER_REPO}
-
-cd /opt/policy
-git pull
-
-chmod +x config/pe/brmsgw-tweaks.sh
-chmod +x config/pe/pap-tweaks.sh
-chmod +x config/pe/pdp-tweaks.sh
-chmod +x config/pe/push-policies.sh
-chmod +x config/drools/apps-install.sh
-chmod +x config/drools/drools-preinstall.sh
-chmod +x config/drools/drools-tweaks.sh
-chmod +x config/db/db.sh
-
-# ensure brmsgw dependency configuration is set up correctly
-
-sed -i -e "s/^BRMS_DEPENDENCY_VERSION=.*$/BRMS_DEPENDENCY_VERSION=${ARTIFACT_VERSION}/g" /opt/policy/config/pe/brmsgw.conf
-
-
-if [ -e /opt/config/public_ip.txt ]
-then
-  IP_ADDRESS=$(cat /opt/config/public_ip.txt)
-else
-  IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2)
-fi
-
-echo $IP_ADDRESS > config/pe/ip_addr.txt
-
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-
-#docker pull $NEXUS_DOCKER_REPO/onap/policy-db:$DOCKER_IMAGE_VERSION
-#docker tag $NEXUS_DOCKER_REPO/onap/policy-db:$DOCKER_IMAGE_VERSION onap/policy/policy-db:latest
-
-docker pull $NEXUS_DOCKER_REPO/onap/policy-pe:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/policy-pe:$DOCKER_IMAGE_VERSION onap/policy-pe:latest
-
-docker pull $NEXUS_DOCKER_REPO/onap/policy-drools:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/policy-drools:$DOCKER_IMAGE_VERSION onap/policy-drools:latest
-
-#docker pull $NEXUS_DOCKER_REPO/onap/policy-nexus:$DOCKER_IMAGE_VERSION
-#docker tag $NEXUS_DOCKER_REPO/onap/policy-nexus:$DOCKER_IMAGE_VERSION onap/policy-nexus:latest
-
-/opt/docker/docker-compose up -d
diff --git a/heat/ONAP/cloud-config/portal_install.sh b/heat/ONAP/cloud-config/portal_install.sh
deleted file mode 100644 (file)
index 3bd9eeb..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Read configuration files
-GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-CODE_REPO=$(cat /opt/config/remote_repo.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-# Clone Gerrit repository and run docker containers
-cd /opt
-git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
-./portal_vm_init.sh
diff --git a/heat/ONAP/cloud-config/portal_vm_init.sh b/heat/ONAP/cloud-config/portal_vm_init.sh
deleted file mode 100644 (file)
index 1764005..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-# Starts docker containers for ONAP Portal in Rackspace.
-# Version for Amsterdam/R1 uses docker-compose.
-
-# be verbose
-set -x
-
-# Establish environment variables
-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)
-# Use "latest" to deploy snapshot images:
-# DOCKER_IMAGE_VERSION=latest
-CLI_DOCKER_VERSION=$(cat /opt/config/cli_docker_version.txt)
-CDR_IMAGE_VERSION=latest
-ZK_IMAGE_VERSION=3.4
-
-# Refresh configuration and scripts
-cd /opt/portal
-git pull
-cd deliveries
-
-# Get image names used below from docker-compose environment file
-source .env
-
-# Refresh images
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/$DB_IMG_NAME:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/$EP_IMG_NAME:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/$SDK_IMG_NAME:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/$CDR_IMG_NAME:$CDR_IMAGE_VERSION
-docker pull $ZK_IMG_NAME:$ZK_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/$WMS_IMG_NAME:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/$CLI_IMG_NAME:$CLI_DOCKER_VERSION
-
-# Tag them as expected by docker-compose file
-docker tag $NEXUS_DOCKER_REPO/$DB_IMG_NAME:$DOCKER_IMAGE_VERSION $DB_IMG_NAME:$PORTAL_TAG
-docker tag $NEXUS_DOCKER_REPO/$EP_IMG_NAME:$DOCKER_IMAGE_VERSION $EP_IMG_NAME:$PORTAL_TAG
-docker tag $NEXUS_DOCKER_REPO/$SDK_IMG_NAME:$DOCKER_IMAGE_VERSION $SDK_IMG_NAME:$PORTAL_TAG
-docker tag $NEXUS_DOCKER_REPO/$CDR_IMG_NAME:$CDR_IMAGE_VERSION $CDR_IMG_NAME:$PORTAL_TAG
-docker tag $ZK_IMG_NAME:$ZK_IMAGE_VERSION $ZK_IMG_NAME:$PORTAL_TAG
-docker tag $NEXUS_DOCKER_REPO/$WMS_IMG_NAME:$DOCKER_IMAGE_VERSION $WMS_IMG_NAME:$PORTAL_TAG
-docker tag $NEXUS_DOCKER_REPO/$CLI_IMG_NAME:$CLI_DOCKER_VERSION $CLI_IMG_NAME:$PORTAL_TAG
-
-# Export variable for local logs directory, and create directory too
-# The leading "./" is required for docker-compose
-export LOGS_DIR=./logs
-mkdir -p $LOGS_DIR
-
-# Export variable for subdirectory with appropriate property files
-# The leading "./" is required for docker-compose
-export PROPS_DIR=./properties_simpledemo
-
-# docker-compose is not in /usr/bin
-/opt/docker/docker-compose down
-/opt/docker/docker-compose up -d
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/robot_install.sh b/heat/ONAP/cloud-config/robot_install.sh
deleted file mode 100644 (file)
index 90e7251..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash -x
-
-# Read configuration files
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-# Short-term fix to get around MSO to SO name change
-cp /opt/config/so_ip_addr.txt /opt/config/mso_ip_addr.txt
-
-
-# Download scripts from Nexus
-mkdir -p /opt/eteshare/config
-cp /opt/boot/robot/integration_preload_parameters.py /opt/eteshare/config/integration_preload_parameters.py
-cp /opt/boot/robot/integration_robot_properties.py /opt/eteshare/config/integration_robot_properties.py
-cp /opt/boot/robot/vm_config2robot.sh /opt/eteshare/config/vm_config2robot.sh
-chmod +x /opt/eteshare/config/vm_config2robot.sh
-cp /opt/boot/robot/ete.sh /opt/ete.sh
-chmod +x /opt/ete.sh
-cp /opt/boot/robot/demo.sh /opt/demo.sh
-chmod +x /opt/demo.sh
-
-mkdir -p /opt/eteshare/logs
-
-# Run docker containers.
-./robot_vm_init.sh
diff --git a/heat/ONAP/cloud-config/robot_vm_init.sh b/heat/ONAP/cloud-config/robot_vm_init.sh
deleted file mode 100644 (file)
index 65eec43..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/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)
-SNIRO_DOCKER_IMAGE_VERSION=$(cat /opt/config/sniro_docker_version.txt)
-
-/bin/bash /opt/eteshare/config/vm_config2robot.sh
-
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/onap/testsuite:$DOCKER_IMAGE_VERSION
-docker rm -f openecompete_container
-
-docker pull $NEXUS_DOCKER_REPO/onap/sniroemulator:$SNIRO_DOCKER_IMAGE_VERSION
-docker rm -f sniroemulator
-
-docker run -d --name openecompete_container -v /opt/eteshare:/share -p 88:88 $NEXUS_DOCKER_REPO/onap/testsuite:$DOCKER_IMAGE_VERSION
-docker run -d --name sniroemulator -p 8080:9999 $NEXUS_DOCKER_REPO/onap/sniroemulator:$SNIRO_DOCKER_IMAGE_VERSION
diff --git a/heat/ONAP/cloud-config/sdc_install.sh b/heat/ONAP/cloud-config/sdc_install.sh
deleted file mode 100644 (file)
index bf6b592..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-# Read configuration files
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
-GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-CODE_REPO=$(cat /opt/config/remote_repo.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-# Create partition and mount the external volume
-cp /opt/boot/sdc_ext_volume_partitions.txt /opt/sdc_ext_volume_partitions.txt
-
-if [[ $CLOUD_ENV == "rackspace" ]]
-then
-       DISK="xvdb"
-else
-       DISK=$(ls /dev |grep -e '^.*db$')
-       sed -i "s/xvdb/$DISK/g" /opt/sdc_ext_volume_partitions.txt
-fi
-
-sfdisk /dev/$DISK < /opt/sdc_ext_volume_partitions.txt
-mkfs -t ext4 /dev/$DISK"1"
-mkdir -p /data
-mount /dev/$DISK"1" /data
-echo "/dev/"$DISK"1  /data           ext4    errors=remount-ro,noatime,barrier=0 0       1" >> /etc/fstab
-
-
-# Clone Gerrit repository
-cd /opt
-mkdir -p /data/environments
-mkdir -p /data/scripts
-mkdir -p /data/logs/BE
-mkdir -p /data/logs/FE
-chmod 777 /data
-chmod 777 /data/logs/BE
-chmod 777 /data/logs/FE
-
-git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
-
-cat > /root/.bash_aliases << EOF
-alias dcls='/data/scripts/docker_clean.sh \$1'
-alias dlog='/data/scripts/docker_login.sh \$1'
-alias rund='/data/scripts/docker_run.sh'
-alias health='/data/scripts/docker_health.sh'
-EOF
-
-# Run docker containers. For openstack Ubuntu 16.04 images this will run as a service after the VM has restarted
-./sdc_vm_init.sh
-
-#Install docker-compose for workflow installation
-mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.23.1/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
-#Prepare env for docker compose
-IP_ADDRESS=$(cat /opt/config/private_ip.txt)
-sed -i "s/yyy/$IP_ADDRESS/g" .env
-
-#Setup sdc workflow using docker compose
-docker-compose up -d
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/sdc_vm_init.sh b/heat/ONAP/cloud-config/sdc_vm_init.sh
deleted file mode 100644 (file)
index 218806b..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/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)
-ENV_NAME=$(cat /opt/config/env_name.txt)
-MR_IP_ADDR=$(cat /opt/config/mr_ip_addr.txt)
-RELEASE=$(cat /opt/config/docker_version.txt)
-
-cd /opt/sdc
-git pull
-
-cd /opt
-cp sdc/sdc-os-chef/environments/Template.json /data/environments
-cp sdc/sdc-os-chef/environments/plugins-configuration.yaml /data/environments
-cp sdc/sdc-os-chef/scripts/docker_run.sh /data/scripts
-cp sdc/sdc-os-chef/scripts/docker_health.sh /data/scripts
-chmod +x /data/scripts/docker_run.sh
-chmod +x /data/scripts/docker_health.sh
-
-IP_ADDRESS=$(cat /opt/config/private_ip.txt)
-
-cat /data/environments/Template.json | sed "s/yyy/"$IP_ADDRESS"/g" > /data/environments/$ENV_NAME.json
-sed -i "s/xxx/"$ENV_NAME"/g" /data/environments/$ENV_NAME.json
-sed -i "s/\"ueb_url_list\":.*/\"ueb_url_list\": \""$MR_IP_ADDR","$MR_IP_ADDR"\",/g" /data/environments/$ENV_NAME.json
-sed -i "s/\"fqdn\":.*/\"fqdn\": [\""$MR_IP_ADDR"\", \""$MR_IP_ADDR"\"]/g" /data/environments/$ENV_NAME.json
-sed -i "s/yyy/"$IP_ADDRESS"/g" /data/environments/plugins-configuration.yaml
-
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-bash /data/scripts/docker_run.sh -r $RELEASE
diff --git a/heat/ONAP/cloud-config/sdnc_install.sh b/heat/ONAP/cloud-config/sdnc_install.sh
deleted file mode 100644 (file)
index 1ab8987..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Read configuration files
-GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-CODE_REPO=$(cat /opt/config/remote_repo.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-# Clone Gerrit repository and run docker containers
-cd /opt
-git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO sdnc
-./sdnc_vm_init.sh
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/sdnc_vm_init.sh b/heat/ONAP/cloud-config/sdnc_vm_init.sh
deleted file mode 100644 (file)
index 7816eab..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt)
-NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
-export NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
-DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
-DGBUILDER_IMAGE_VERSION=$(cat /opt/config/dgbuilder_version.txt)
-export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
-export DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-
-cd /opt/sdnc
-git pull
-
-cd /opt/sdnc/installation/src/main/yaml
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-
-docker pull $NEXUS_DOCKER_REPO/onap/sdnc-image:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/sdnc-image:$DOCKER_IMAGE_VERSION onap/sdnc-image:latest
-
-docker pull $NEXUS_DOCKER_REPO/onap/sdnc-ansible-server-image:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/sdnc-ansible-server-image:$DOCKER_IMAGE_VERSION onap/sdnc-ansible-server-image:latest
-
-docker pull $NEXUS_DOCKER_REPO/onap/admportal-sdnc-image:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/admportal-sdnc-image:$DOCKER_IMAGE_VERSION onap/admportal-sdnc-image:latest
-
-docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$DGBUILDER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$DGBUILDER_IMAGE_VERSION onap/ccsdk-dgbuilder-image:latest
-
-docker pull $NEXUS_DOCKER_REPO/onap/sdnc-ueb-listener-image:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/sdnc-ueb-listener-image:$DOCKER_IMAGE_VERSION onap/sdnc-ueb-listener-image:latest
-
-docker pull $NEXUS_DOCKER_REPO/onap/sdnc-dmaap-listener-image:$DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/sdnc-dmaap-listener-image:$DOCKER_IMAGE_VERSION onap/sdnc-dmaap-listener-image:latest
-
-echo "Waiting for 10 minutes for SDC to start";
-RES=$(curl -s -X GET   http://10.0.3.1:8080/sdc2/rest/healthCheck   -H 'Accept: application/json'   -H 'Cache-Control: no-cache'   -H 'Content-Type: application/json'   -H 'Postman-Token: ffeba4a6-82b6-44d8-87e6-8b510f1127fd' | jq '.componentsInfo[] | select(.healthCheckComponent == "BE") | .description')
-counter=0;
-while [[ $RES != "\"OK\"" ]]; do
-       sleep 10;
-       let counter=$counter+1
-       if [[ $counter -eq 60 ]]; then
-               break;
-       fi
-done
-
-if [[ $RES == "\"OK\"" ]]; then
-       echo "Starting SDNC containers"
-else
-       echo "Timeout expired before SDC BE health check passed. SDNC containers starting, but UEB Listener may not be healthy"
-fi
-
-/opt/docker/docker-compose up -d
diff --git a/heat/ONAP/cloud-config/serv.sh b/heat/ONAP/cloud-config/serv.sh
deleted file mode 100644 (file)
index 62466d9..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          __vm_init_script__
-# 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
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-dir="/opt"
-cmd="./__vm_init_script__"
-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/heat/ONAP/cloud-config/sms_install.sh b/heat/ONAP/cloud-config/sms_install.sh
deleted file mode 100644 (file)
index 2dd8320..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Read configuration files
-GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-CODE_REPO=$(cat /opt/config/remote_repo.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-# Clone Gerrit repository and run docker containers
-cd /opt
-git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
-./sms_vm_init.sh
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/sms_vm_init.sh b/heat/ONAP/cloud-config/sms_vm_init.sh
deleted file mode 100644 (file)
index 62a9ac8..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/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/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/heat/ONAP/cloud-config/so_install.sh b/heat/ONAP/cloud-config/so_install.sh
deleted file mode 100644 (file)
index 36c7c8c..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# Read configuration files
-#OPENSTACK_API_KEY=$(cat /opt/config/openstack_api_key.txt)
-GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-CODE_REPO=$(cat /opt/config/remote_repo.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-# Clone Gerrit repository and run docker containers.
-cd /opt
-git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO test_lab
-#SO_ENCRYPTION_KEY=$(cat /opt/test_lab/encryption.key)
-#echo -n "$OPENSTACK_API_KEY" | openssl aes-128-ecb -e -K $SO_ENCRYPTION_KEY -nosalt | xxd -c 256 -p > /opt/config/api_key.txt
-
-./so_vm_init.sh
diff --git a/heat/ONAP/cloud-config/so_vm_init.sh b/heat/ONAP/cloud-config/so_vm_init.sh
deleted file mode 100644 (file)
index 1acf2eb..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/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)
-OPENSTACK_APIKEY=$(cat /opt/config/openstack_api_key.txt)
-export MSO_DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
-export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
-
-# Deployments in OpenStack require a keystone file
-if [ -e /opt/config/keystone.txt ]
-then
-       KEYSTONE_URL=$(cat /opt/config/keystone.txt)
-       OPENSTACK_REGION=$(cat /opt/config/openstack_region.txt)
-       DCP_CLLI="DEFAULT_KEYSTONE"
-       AUTH_TYPE="USERNAME_PASSWORD"
-       read -d '' CLOUD_SITES <<-EOF
-        "cloud_sites": [{
-                 "aic_version": "2.5",
-                 "id": "$OPENSTACK_REGION",
-                 "identity_service_id": "$DCP_CLLI",
-                 "lcp_clli": "$OPENSTACK_REGION",
-                 "region_id": "$OPENSTACK_REGION"
-        }],
-EOF
-else
-       KEYSTONE_URL="https://identity.api.rackspacecloud.com/v2.0"
-       DCP_CLLI="RAX_KEYSTONE"
-       AUTH_TYPE="RACKSPACE_APIKEY"
-       read -d '' CLOUD_SITES <<-EOF
-        "cloud_sites": [
-               {
-                 "id": "Dallas",
-                 "aic_version": "2.5",
-                 "lcp_clli": "DFW",
-                 "region_id": "DFW",
-                 "identity_service_id": "$DCP_CLLI"
-               },
-
-               {
-                 "id": "Northern Virginia",
-                 "aic_version": "2.5",
-                 "lcp_clli": "IAD",
-                 "region_id": "IAD",
-                 "identity_service_id": "$DCP_CLLI"
-               },
-
-               {
-                 "id": "Chicago",
-                 "aic_version": "2.5",
-                 "lcp_clli": "ORD",
-                 "region_id": "ORD",
-                 "identity_service_id": "$DCP_CLLI"
-               }
-         ],
-EOF
-fi
-
-# Update the SO configuration file.
-read -d '' MSO_CONFIG_UPDATES <<-EOF
-{
-"default_attributes":
-  {
-    "asdc-connections":
-      {
-           "asdc-controller1":
-           {
-               "environmentName": "$DMAAP_TOPIC"
-           }
-      },
-      "mso-po-adapter-config": 
-         {
-               $CLOUD_SITES
-           "identity_services": 
-               [
-                   {"dcp_clli": "$DCP_CLLI", 
-                   "identity_url": "$KEYSTONE_URL/v2.0",
-                    "mso_id": "$OPENSTACK_USERNAME", 
-                    "mso_pass": "$OPENSTACK_APIKEY", 
-                    "admin_tenant": "service", 
-                    "member_role": "admin", 
-                    "tenant_metadata": "true",
-                    "identity_server_type": "KEYSTONE", 
-                    "identity_authentication_type": "$AUTH_TYPE"
-                       
-                   }
-               ]
-       },
-       "mso-bpmn-urn-config": {
-               "msoDefaultCloudOwnerId": "CloudOwner"
-       }
-  }
-}
-EOF
-export MSO_CONFIG_UPDATES
-
-# Deploy the environment
-cd /opt/test_lab
-git pull
-chmod +x deploy.sh
-#This script takes in input 2 nexus repos (the first one for the SO image, the second one for mariadb)
-./deploy.sh $NEXUS_DOCKER_REPO $NEXUS_USERNAME $NEXUS_PASSWD $NEXUS_DOCKER_REPO $NEXUS_USERNAME $NEXUS_PASSWD
diff --git a/heat/ONAP/cloud-config/vid_install.sh b/heat/ONAP/cloud-config/vid_install.sh
deleted file mode 100644 (file)
index 23dbce7..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Read configuration files
-GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-CODE_REPO=$(cat /opt/config/remote_repo.txt)
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-    export http_proxy=$HTTP_PROXY
-    export https_proxy=$HTTPS_PROXY
-fi
-
-# Clone Gerrit repository and run docker containers
-cd /opt
-git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
-./vid_vm_init.sh
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/vid_vm_init.sh b/heat/ONAP/cloud-config/vid_vm_init.sh
deleted file mode 100644 (file)
index c7f2b6f..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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)
-
-cd /opt/vid
-git pull
-cd /opt
-
-docker pull mariadb:10
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/onap/vid:$DOCKER_IMAGE_VERSION
-
-docker rm -f vid-mariadb
-docker rm -f vid-server
-
-docker run --name vid-mariadb -e MYSQL_DATABASE=vid_openecomp_epsdk -e MYSQL_USER=vidadmin -e MYSQL_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -e MYSQL_ROOT_PASSWORD=LF+tp_1WqgSY -v /opt/vid/lf_config/vid-my.cnf:/etc/mysql/my.cnf -v /var/lib/mysql -d mariadb:10
-
-docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U --name vid-server -p 8080:8080 -p 8443:8443 --link vid-mariadb:vid-mariadb-docker-instance -d $NEXUS_DOCKER_REPO/onap/vid:$DOCKER_IMAGE_VERSION
diff --git a/heat/ONAP/manifest-to-env.sh b/heat/ONAP/manifest-to-env.sh
deleted file mode 100755 (executable)
index 017b091..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-#==================LICENSE_START==========================================
-#
-# Copyright (c) 2017 Huawei Technologies Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#==================LICENSE_END============================================
-
-# USAGE: Pipe in docker-manifest.csv from the integration repo.  This
-# script converts it into a series of environment variable settings
-# that can then be used with envsubst to set the docker versions in
-# onap_openstack_template.env.
-#
-# EXAMPLE:
-#   source <(./manifest-to-env.sh  < ~/Projects/onap/integration/version-manifest/src/main/resources/docker-manifest.csv)
-#   envsubst < onap_openstack_template.env > onap_openstack.env
-
-sed '1d' | awk -F , '{ v=$1; gsub(".*[./]","",$1); gsub("-","_",$1); print "export "  toupper($1) "_DOCKER=" $2 " # " v }'
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
deleted file mode 100644 (file)
index 7b19fbf..0000000
+++ /dev/null
@@ -1,220 +0,0 @@
-parameters:
-
-  ##############################################
-  #                                            #
-  # Parameters used across all ONAP components #
-  #                                            #
-  ##############################################
-
-  public_net_id: PUT YOUR NETWORK ID HERE
-
-  public_net_name: PUT YOUR NETWORK NAME HERE
-
-  ubuntu_1404_image: PUT THE UBUNTU 14.04 IMAGE NAME HERE
-
-  ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE
-
-  flavor_small: PUT THE SMALL FLAVOR NAME HERE
-
-  flavor_medium: PUT THE MEDIUM FLAVOR NAME HERE
-
-  flavor_large: PUT THE LARGE FLAVOR NAME HERE
-
-  flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
-
-  vm_base_name: onap
-
-  key_name: onap_key
-
-  pub_key: PUT YOUR PUBLIC KEY HERE
-
-  nexus_docker_repo: nexus3.onap.org:10001
-
-  nexus_username: docker
-
-  nexus_password: docker
-
-  dmaap_topic: AUTO
-
-  artifacts_version: 1.3.0-SNAPSHOT
-
-  openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
-
-  openstack_tenant_name: PUT YOUR OPENSTACK PROJECT NAME HERE
-
-  openstack_username: PUT YOUR OPENSTACK USERNAME HERE
-
-  openstack_api_key: PUT YOUR ENCRYPTED OPENSTACK PASSWORD HERE
-
-  openstack_region: RegionOne
-
-  keystone_url: PUT THE KEYSTONE URL HERE (do not include version number)
-
-  cloud_env: openstack
-
-  http_proxy: PUT YOUR HTTP PROXY ADDRESS (if you don't work behind a proxy put no_proxy)
-
-  https_proxy: PUT YOUR HTTPS PROXY ADDRESS (if you don't work behind a proxy put no_proxy)
-
-
-  ######################
-  #                    #
-  # Network parameters #
-  #                    #
-  ######################
-
-  dns_list: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems)
-  external_dns: PUT THE FIRST ADDRESS OF THE EXTERNAL DNS LIST HERE
-  dns_forwarder: PUT THE IP OF DNS FORWARDER FOR ONAP DEPLOYMENT'S OWN DNS SERVER
-  oam_network_cidr: 10.0.0.0/16
-
-  ### Private IP addresses ###
-
-  aai1_ip_addr: 10.0.1.1
-  aai2_ip_addr: 10.0.1.2
-  appc_ip_addr: 10.0.2.1
-  dcae_ip_addr: 10.0.4.1
-  dns_ip_addr: 10.0.100.1
-  so_ip_addr: 10.0.5.1
-  mr_ip_addr: 10.0.11.1
-  policy_ip_addr: 10.0.6.1
-  portal_ip_addr: 10.0.9.1
-  robot_ip_addr: 10.0.10.1
-  sdc_ip_addr: 10.0.3.1
-  sdnc_ip_addr: 10.0.7.1
-  vid_ip_addr: 10.0.8.1
-  clamp_ip_addr: 10.0.12.1
-  multiserv_ip_addr: 10.0.14.1
-  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
-
-  ###########################
-  #                         #
-  # Parameters used by DCAE #
-  #                         #
-  ###########################
-
-  dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R3MVP, R3, or R3PLUS)
-
-  ################################
-  #                              #
-  # Docker versions and branches #
-  # Generated using onap_openstack_template.env and manifest-to-env.sh
-  #                              #
-  ################################
-
-  aai_branch: master
-  appc_branch: master
-  so_branch: master
-  mr_branch: master
-  policy_branch: master
-  portal_branch: master
-  sdc_branch: master
-  sdnc_branch: master
-  vid_branch: master
-  clamp_branch: master
-  vnfsdk_branch: master
-  music_branch: master
-  nbi_branch: master
-  aaf_branch: master
-  sms_branch: master
-  oof_branch: master
-
-  aai_docker: "1.2.2"
-  appc_docker: "1.4.0-SNAPSHOT-latest"
-  so_docker: "1.3.0-STAGING-latest"
-  policy_docker: "1.3-SNAPSHOT-latest"
-  portal_docker: "2.2.0"
-  robot_docker: "1.3.1-STAGING-latest"
-  sniro_docker: "1.0.0"
-  sdc_docker: "1.3-STAGING-latest"
-  sdnc_docker: "1.4-STAGING-latest"
-  vid_docker: "3.0-STAGING-latest"
-  clamp_docker: "3.0-STAGING-latest"
-  msb_docker: "1.2.0-STAGING-latest"
-  mvim_docker: "1.2.0-STAGING"
-  mvim_openstack_docker: "1.2.0-STAGING"
-  uui_docker: "1.1.1"
-  esr_docker: "1.1.0"
-  sdc_wfd_docker: "1.1.0"
-  dgbuilder_docker: "0.3-STAGING-latest"
-  ansible_docker: "0.3.0"
-  cli_docker: "2.0.2"
-  music_docker: "2.5.3"
-  cassandra_music_docker: "3.0.0"
-  optf_has_docker: "1.2.1"
-  optf_osdf_docker: "1.2.1"
-  aaf_docker: "2.1.2-SNAPSHOT"
-  sms_docker: "2.0.0"
-  nbi_docker: "3.0.1"
-  dbcl_docker: "1.0.12"
-
-  dcae_docker: "1.1.3"
-  dcae_bootstrap_docker: "1.1.3"
-  dcae_k8sbootstrap_docker: "1.4.2"
-  dcae_redisc_docker: "1.0.0"
-  dcae_hc_docker: "1.1.0"
-  dcae_tls_docker: "1.0.0"
-  dcae_cb_docker: "4.1.0"
-  dcae_snmptrap_docker: "1.4.0"
-  dcae_ves_docker: "1.3.1"
-  dcae_hvves_docker: "1.0.0-SNAPSHOT"
-  dcae_datafile_docker: "1.0.0"
-  dcae_cm_docker: "1.4.1"
-  dcae_tca_docker: "1.1.0"
-  dcae_tca2_docker: "1.0.0"
-  dcae_cbs_docker: "2.2.3"
-  dcae_dh_docker: "3.0.2"
-  dcae_inv_docker: "3.0.4"
-  dcae_ph_docker: "4.3.1"
-  dcae_sch_docker: "1.1.5"
-  dcae_prh_docker: "1.0.0"
-  dcae_heartbeat_docker: "1.3.0"
-  dcae_mua_docker: "0.0.1"
-  dcae_msnmp_docker: "latest"
-  holmes_rm_docker: "1.2.0-STAGING-latest"
-  holmes_em_docker: "1.2.0-STAGING-latest"
-
-  vfc_db_docker: "1.1.0-STAGING-latest"
-  vfc_nokia_docker: "1.1.0"
-  vfc_nokiav2_docker: "1.1.0"
-  vfc_ztevnfmdriver_docker: "1.1.0"
-  vfc_ztesdncdriver_docker: "1.1.0"
-  vfc_vnfres_docker: "1.1.0"
-  vfc_vnfmgr_docker: "1.1.0"
-  vfc_vnflcm_docker: "1.1.0"
-  vfc_resmanagement_docker: "1.1.0"
-  vfc_nslcm_docker: "1.1.0"
-  vfc_huawei_docker: "1.1.0"
-  vfc_jujudriver_docker: "1.1.0"
-  vfc_gvnfmdriver_docker: "1.1.0"
-  vfc_emsdriver_docker: "1.1.0"
-  vfc_catalog_docker: "1.1.0"
-  vfc_wfengine_mgrservice_docker: "1.1.0"
-  vfc_wfengine_activiti_docker: "1.1.0"
-  vfc_multivimproxy_docker: "1.0.0"
-
-  #####################
-  #                   #
-  # ONAP repositories #
-  #                   #
-  #####################
-  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
-  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
-  sdc_repo: http://gerrit.onap.org/r/sdc.git
-  sdnc_repo: http://gerrit.onap.org/r/sdnc/oam.git
-  vid_repo: http://gerrit.onap.org/r/vid.git
-  clamp_repo: http://gerrit.onap.org/r/clamp.git
-  vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git
-  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
deleted file mode 100644 (file)
index 3cc01e7..0000000
+++ /dev/null
@@ -1,2570 +0,0 @@
-##########################################################################
-#
-#==================LICENSE_START==========================================
-#
-#
-# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#==================LICENSE_END============================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
-##########################################################################
-
-heat_template_version: 2015-10-15
-
-description: Heat template to install ONAP components
-
-##############
-#            #
-# PARAMETERS #
-#            #
-##############
-
-parameters:
-
-  ##############################################
-  #                                            #
-  # Parameters used across all ONAP components #
-  #                                            #
-  ##############################################
-
-  public_net_id:
-    type: string
-    description: The ID of the Public network for floating IP address allocation
-
-  public_net_name:
-    type: string
-    description: The name of the Public network referred by public_net_id
-
-  ubuntu_1404_image:
-    type: string
-    description: Name of the Ubuntu 14.04 image
-
-  ubuntu_1604_image:
-    type: string
-    description: Name of the Ubuntu 16.04 image
-
-  flavor_small:
-    type: string
-    description: Name of the Small Flavor supported by the cloud provider
-
-  flavor_medium:
-    type: string
-    description: Name of the Medium Flavor supported by the cloud provider
-
-  flavor_large:
-    type: string
-    description: Name of the Large Flavor supported by the cloud provider
-
-  flavor_xlarge:
-    type: string
-    description: Name of the Extra Large Flavor supported by the cloud provider
-
-  vm_base_name:
-    type: string
-    description: Base name of ONAP VMs
-
-  key_name:
-    type: string
-    description: Public/Private key pair name
-
-  pub_key:
-    type: string
-    description: Public key to be installed on the compute instance
-
-  nexus_artifact_repo:
-    type: string
-    description: Complete URL for the Nexus repository for Maven artifacts.
-    default: "https://nexus.onap.org"
-
-  nexus_docker_repo:
-    type: string
-    description: Complete URL for the Nexus repository for docker images.
-
-  nexus_username:
-    type: string
-    description: Nexus Repository username
-
-  nexus_password:
-    type: string
-    description: Nexus Repository password
-
-  artifacts_version:
-    type: string
-    description: Artifacts version of ONAP components
-
-  dmaap_topic:
-    type: string
-    description: DMaaP Topic name
-
-  openstack_tenant_id:
-    type: string
-    description: OpenStack tenant ID
-
-  openstack_tenant_name:
-    type: string
-    description: OpenStack tenant name (matching with the openstack_tenant_id)
-
-  openstack_username:
-    type: string
-    description: OpenStack username
-
-  openstack_api_key:
-    type: string
-    description: Encrypted OpenStack password
-
-  keystone_url:
-    type: string
-    description: URL of OpenStack Keystone
-
-  cloud_env:
-    type: string
-    description: Cloud Provider Name in lower case
-
-  openstack_region:
-    type: string
-    description: Region where the DCAE controller will spin the VMs
-
-  http_proxy:
-    type: string
-    description: http proxy address
-    default: 'no_proxy'
-
-  https_proxy:
-    type: string
-    description: https proxy address
-    default: 'no_proxy'
-
-  ######################
-  #                    #
-  # Network parameters #
-  #                    #
-  ######################
-
-  dns_list:
-    type: comma_delimited_list
-    description: List of External DNS for OAM ONAP network
-
-  external_dns:
-    type: string
-    description: Public IP of the external DNS for ONAP network
-
-  dns_forwarder:
-    type: string
-    description: the forwarder address for setting up ONAP's private DNS server
-
-  oam_network_cidr:
-    type: string
-    description: CIDR of the OAM ONAP network
-
-  use_oam_net_for_robot:
-    type: boolean
-    description: Whether to use oam_network for Robot VNFs or not.  The default is false, which uses public_net_id.  Set to true if the Robot VNFs are unable to bind to the public network (needed by TLAB).
-    default: false
-
-  ### Private IP addresses ###
-  aai1_ip_addr:
-    type: string
-  aai2_ip_addr:
-    type: string
-  appc_ip_addr:
-    type: string
-  dcae_ip_addr:
-    type: string
-  dns_ip_addr:
-    type: string
-  so_ip_addr:
-    type: string
-  mr_ip_addr:
-    type: string
-  policy_ip_addr:
-    type: string
-  portal_ip_addr:
-    type: string
-  robot_ip_addr:
-    type: string
-  sdc_ip_addr:
-    type: string
-  sdnc_ip_addr:
-    type: string
-  vid_ip_addr:
-    type: string
-  clamp_ip_addr:
-    type: string
-  multiserv_ip_addr:
-    type: string
-  music_ip_addr:
-    type: string
-  oof_ip_addr:
-    type: string
-  aaf_ip_addr:
-    type: string
-  sms_ip_addr:
-    type: string
-  nbi_ip_addr:
-    type: string
-
-  ###########################
-  #                         #
-  # Parameters used by DCAE #
-  #                         #
-  ###########################
-
-  dcae_deployment_profile:
-    type: string
-    default: R3
-    description: DCAE deployment profile.  Currently supported profiles R2, R2MVP, and R2PLUS.
-
-  #####################
-  #                   #
-  # ONAP repositories #
-  #                   #
-  #####################
-
-  aai_repo:
-    type: string
-  appc_repo:
-    type: string
-  mr_repo:
-    type: string
-  so_repo:
-    type: string
-  policy_repo:
-    type: string
-  portal_repo:
-    type: string
-  sdc_repo:
-    type: string
-  sdnc_repo:
-    type: string
-  vid_repo:
-    type: string
-  clamp_repo:
-    type: string
-  vnfsdk_repo:
-    type: string
-  music_repo:
-    type: string
-  nbi_repo:
-    type: string
-  aaf_repo:
-    type: string
-  sms_repo:
-    type: string
-  oof_repo:
-    type: string
-
-  ################################
-  #                              #
-  # Docker versions and branches #
-  #                              #
-  ################################
-
-  aai_docker:
-    type: string
-  appc_docker:
-    type: string
-  so_docker:
-    type: string
-
-  dcae_docker:
-    type: string
-    default: latest
-  dcae_bootstrap_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.deployments.bootstrap
-  dcae_k8sbootstrap_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container
-  dcae_redisc_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.deployments.redis-cluster-container
-  dcae_hc_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.deployments.healthcheck-container
-  dcae_tls_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.deployments.tls-init-container
-  dcae_cb_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.platform.cdapbroker
-  dcae_snmptrap_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.collectors.snmptrap
-  dcae_ves_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.collectors.ves.vescollector
-  dcae_hvves_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main
-  dcae_datafile_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server
-  dcae_cm_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.deployments.cm-container
-  dcae_tca_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.deployments.tca-cdap-container
-  dcae_tca2_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.analytics.tca-gen2
-  dcae_cbs_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.platform.configbinding.app-app
-  dcae_dh_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.platform.deployment-handler
-  dcae_inv_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.platform.inventory-api
-  dcae_ph_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.platform.policy-handler
-  dcae_sch_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.platform.servicechange-handler
-  dcae_prh_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.services.prh.prh-app-server
-  dcae_heartbeat_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.services.heartbeat
-  dcae_mua_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor
-  dcae_msnmp_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/org.onap.dcaegen2.services.mapper.vesadapter.snmpmapper
-  holmes_em_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/holmes/engine-management
-  holmes_rm_docker:
-    type: string
-    default: latest
-    description: Docker image version for onap/holmes/rule-management
-
-  policy_docker:
-    type: string
-  portal_docker:
-    type: string
-  robot_docker:
-    type: string
-  sniro_docker:
-    type: string
-  sdc_docker:
-    type: string
-  sdc_wfd_docker:
-    type: string
-  sdnc_docker:
-    type: string
-  vid_docker:
-    type: string
-  clamp_docker:
-    type: string
-  msb_docker:
-    type: string
-  mvim_docker:
-    type: string
-  mvim_openstack_docker:
-    type: string
-  uui_docker:
-    type: string
-  esr_docker:
-    type: string
-  dgbuilder_docker:
-    type: string
-  ansible_docker:
-    type: string
-  cli_docker:
-    type: string
-  music_docker:
-    type: string
-  cassandra_music_docker:
-    type: string
-  optf_has_docker:
-    type: string
-  optf_osdf_docker:
-    type: string
-  aaf_docker:
-    type: string
-  sms_docker:
-    type: string
-  nbi_docker:
-    type: string
-  dbcl_docker:
-    type: string
-
-  vfc_db_docker:
-    type: string
-  vfc_nokia_docker:
-    type: string
-  vfc_nokiav2_docker:
-    type: string
-  vfc_ztevnfmdriver_docker:
-    type: string
-  vfc_ztesdncdriver_docker:
-    type: string
-  vfc_vnfres_docker:
-    type: string
-  vfc_vnfmgr_docker:
-    type: string
-  vfc_vnflcm_docker:
-    type: string
-  vfc_resmanagement_docker:
-    type: string
-  vfc_nslcm_docker:
-    type: string
-  vfc_huawei_docker:
-    type: string
-  vfc_jujudriver_docker:
-    type: string
-  vfc_gvnfmdriver_docker:
-    type: string
-  vfc_emsdriver_docker:
-    type: string
-  vfc_catalog_docker:
-    type: string
-  vfc_wfengine_mgrservice_docker:
-    type: string
-  vfc_wfengine_activiti_docker:
-    type: string
-  vfc_multivimproxy_docker:
-    type: string
-
-  aai_branch:
-    type: string
-  appc_branch:
-    type: string
-  so_branch:
-    type: string
-  mr_branch:
-    type: string
-  policy_branch:
-    type: string
-  portal_branch:
-    type: string
-  sdc_branch:
-    type: string
-  sdnc_branch:
-    type: string
-  vid_branch:
-    type: string
-  clamp_branch:
-    type: string
-  vnfsdk_branch:
-    type: string
-  music_branch:
-    type: string
-  nbi_branch:
-    type: string
-  aaf_branch:
-    type: string
-  sms_branch:
-    type: string
-  oof_branch:
-    type: string
-
-#############
-#           #
-# RESOURCES #
-#           #
-#############
-
-resources:
-  random-str:
-    type: OS::Heat::RandomString
-    properties:
-      length: 4
-
-  # Public key used to access ONAP components
-  vm_key:
-    type: OS::Nova::KeyPair
-    properties:
-      name:
-        str_replace:
-          template: base_rand
-          params:
-            base: { get_param: key_name }
-            rand: { get_resource: random-str }
-      public_key: { get_param: pub_key }
-      save_private_key: false
-
-
-  # ONAP security group
-  onap_sg:
-    type: OS::Neutron::SecurityGroup
-    properties:
-      name:
-        str_replace:
-          template: base_rand
-          params:
-            base: onap_sg
-            rand: { get_resource: random-str }
-      description: security group used by ONAP
-      rules:
-        # All egress traffic
-        - direction: egress
-          ethertype: IPv4
-        - direction: egress
-          ethertype: IPv6
-        # ingress traffic
-        # ICMP
-        - protocol: icmp
-        - protocol: udp
-          port_range_min: 1
-          port_range_max: 65535
-        - protocol: tcp
-          port_range_min: 1
-          port_range_max: 65535
-        # Protocols used for vLB/vDNS use case
-        - protocol: 47
-        - protocol: 53
-        - protocol: 132
-
-
-  # ONAP management private network
-  oam_onap:
-    type: OS::Neutron::Net
-    properties:
-      name:
-        str_replace:
-          template: oam_onap_rand
-          params:
-            rand: { get_resource: random-str }
-
-  oam_onap_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      name:
-        str_replace:
-          template: oam_onap_rand
-          params:
-            rand: { get_resource: random-str }
-      network_id: { get_resource: oam_onap }
-      cidr: { get_param: oam_network_cidr }
-      dns_nameservers: { get_param: dns_list }
-
-  router:
-    type: OS::Neutron::Router
-    properties:
-      external_gateway_info:
-        network: { get_param: public_net_id }
-
-  router_interface:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router_id: { get_resource: router }
-      subnet_id: { get_resource: oam_onap_subnet }
-
-
-  common_config_script:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: ungrouped
-      config:
-        str_replace:
-          params:
-            __artifacts_version__: { get_param: artifacts_version }
-            __cloud_env__: { get_param: cloud_env }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __external_dns__: { get_param: external_dns }
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __openstack_username__: { get_param: openstack_username }
-            __openstack_tenant_id__: { get_param: openstack_tenant_id }
-            __openstack_api_key__: { get_param: openstack_api_key }
-            __openstack_region__: { get_param: openstack_region }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__openstack_username__" > /opt/config/openstack_username.txt
-            echo "__openstack_tenant_id__" > /opt/config/openstack_tenant_id.txt
-            echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt
-            echo "__openstack_region__" > /opt/config/openstack_region.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
-
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-              echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-              echo "{" >> /etc/apt/apt.conf.d/apt.conf
-              echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-              echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-              echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-              echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-              export http_proxy=__http_proxy__
-              export https_proxy=__https_proxy__
-            fi
-
-            apt update
-            apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-transport-https ca-certificates wget git ntp ntpdate make jq unzip
-
-            # Download boot scripts
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            cd /opt
-            while [ -z "$ZIP_NAME" ] || [ ! -s "$ZIP_NAME" ]; do
-              wget --content-disposition "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__"
-              ZIP_NAME=$(ls -1 /opt/boot-*.zip)
-            done
-            mkdir -p /opt/boot
-            unzip $ZIP_NAME -d /opt/boot
-
-            # Enable autorestart when VM reboots
-            update-rc.d serv.sh defaults
-
-            # Download and install docker-engine
-            echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | tee /etc/apt/sources.list.d/docker.list
-            apt-get update
-            apt-get install -y --allow-unauthenticated docker-engine
-
-            # Install docker-compose
-            mkdir -p /opt/docker
-            curl -L "https://github.com/docker/compose/releases/download/1.16.1/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
-            MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
-            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
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-              echo "[Service]" > /etc/systemd/system/docker.service.d/http-proxy.conf
-              echo "Environment=\"http_proxy=http://__http_proxy__" >> /etc/systemd/system/docker.service.d/http-proxy.conf
-              echo "Environment=\"https_proxy=https://__https_proxy__" >>/etc/systemd/system/docker.service.d/http-proxy.conf
-              echo "Environment=\"HTTP_PROXY=HTTP://__http_proxy__" >>/etc/systemd/system/docker.service.d/http-proxy.conf
-              echo "Environment=\"HTTPS_PROXY=HTTPS://__https_proxy__" >>/etc/systemd/system/docker.service.d/http-proxy.conf
-            fi
-            systemctl daemon-reload
-            service docker restart
-
-            # DNS IP address configuration
-            echo "nameserver __dns_ip_addr__" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-  # DNS Server instantiation
-  dns_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dns_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  dns_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: dns_private_port }
-
-  dns_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_small }
-      name:
-        str_replace:
-          template: base-dns-server
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: dns_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: dns_vm_config }
-
-  dns_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/dns_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/dns_install.sh }
-
-  dns_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: dns_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __oam_network_cidr__: { get_attr: [oam_onap_subnet, cidr] }
-              __aai1_ip_addr__: { get_param: aai1_ip_addr }
-              __aai2_ip_addr__: { get_param: aai2_ip_addr }
-              __appc_ip_addr__: { get_param: appc_ip_addr }
-              __dcae_ip_addr__: { get_param: dcae_ip_addr }
-              __so_ip_addr__: { get_param: so_ip_addr }
-              __mr_ip_addr__: { get_param: mr_ip_addr }
-              __policy_ip_addr__: { get_param: policy_ip_addr }
-              __portal_ip_addr__: { get_param: portal_ip_addr }
-              __robot_ip_addr__: { get_param: robot_ip_addr }
-              __sdc_ip_addr__: { get_param: sdc_ip_addr }
-              __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
-              __vid_ip_addr__: { get_param: vid_ip_addr }
-              __clamp_ip_addr__: { get_param: clamp_ip_addr }
-              __multiserv_ip_addr__: { get_param: multiserv_ip_addr }
-              __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 }
-              __dns_forwarder__: { get_param: dns_forwarder }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-              echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
-              echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
-              echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt
-              echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
-              echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
-              echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
-              echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
-              echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
-              echo "__robot_ip_addr__" > /opt/config/robot_ip_addr.txt
-              echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
-              echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
-              echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
-              echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt
-              echo "__multiserv_ip_addr__" > /opt/config/multiserv_ip_addr.txt
-              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 "__dns_forwarder__" > /opt/config/dns_forwarder.txt
-
-              cd /opt
-              ./dns_install.sh
-
-
-  # A&AI instantiation (2 VMs)
-  aai1_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: aai1_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  aai1_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: aai1_private_port }
-
-  aai1_vm:
-    type: OS::Nova::Server
-    depends_on: aai2_vm
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_xlarge }
-      name:
-        str_replace:
-          template: base-aai-inst1
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: aai1_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: aai1_vm_config }
-
-  aai1_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/aai_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/aai_install.sh }
-        - path: /opt/aai_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/aai_vm_init.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: aai_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  aai1_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: aai1_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __dmaap_topic__: { get_param: dmaap_topic }
-              __docker_version__: { get_param: aai_docker }
-              __gerrit_branch__: { get_param: aai_branch }
-              __aai_repo__: { get_param: aai_repo }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              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 "__aai_repo__" > /opt/config/remote_repo.txt
-
-              cd /opt
-              ./aai_install.sh
-
-
-  aai2_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: aai2_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  aai2_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: aai2_private_port }
-
-  aai2_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_xlarge }
-      name:
-        str_replace:
-          template: base-aai-inst2
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: aai2_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: aai2_vm_config }
-
-  aai2_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/aai_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/aai_install.sh }
-        - path: /opt/aai_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/aai_vm_init.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: aai_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  aai2_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: aai2_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __dmaap_topic__: { get_param: dmaap_topic }
-              __docker_version__: { get_param: aai_docker }
-              __gerrit_branch__: { get_param: aai_branch }
-              __aai_repo__: { get_param: aai_repo }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              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 "__aai_repo__" > /opt/config/remote_repo.txt
-
-              cd /opt
-              ./aai_install.sh
-
-
-  # SO instantiation
-  so_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: so_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  so_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: so_private_port }
-
-  so_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace:
-          template: base-so
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: so_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: so_vm_config }
-
-  so_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/so_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/so_install.sh }
-        - path: /opt/so_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/so_vm_init.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: so_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  so_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: so_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __keystone_url__: { get_param: keystone_url }
-              __dmaap_topic__: { get_param: dmaap_topic }
-              __docker_version__: { get_param: so_docker }
-              __gerrit_branch__: { get_param: so_branch }
-              __so_repo__: { get_param: so_repo }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-              ln -s /opt/config/openstack_tenant_id.txt /opt/config/tenant_id.txt
-              echo "__keystone_url__" > /opt/config/keystone.txt
-              echo "__docker_version__" > /opt/config/docker_version.txt
-              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-              echo "__so_repo__" > /opt/config/remote_repo.txt
-
-              cd /opt
-              ./so_install.sh
-
-
-  # Message Router instantiation
-  mrouter_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: mr_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  mrouter_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: mrouter_private_port }
-
-  mrouter_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace:
-          template: base-message-router
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: mrouter_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: mrouter_vm_config }
-
-  mrouter_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/mr_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/mr_install.sh }
-        - path: /opt/mr_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/mr_vm_init.sh }
-        - path: /opt/dbcl_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/dbcl_vm_init.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: mr_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  mrouter_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: mrouter_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __gerrit_branch__: { get_param: mr_branch }
-              __mr_repo__: { get_param: mr_repo }
-              __dbcl_docker__: { get_param: dbcl_docker }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-              echo "__mr_repo__" > /opt/config/remote_repo.txt
-              echo "__dbcl_docker__" > /opt/config/docker_version.txt
-
-              cd /opt
-              ./mr_install.sh
-
-
-  # Robot Framework instantiation
-  robot_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: robot_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  robot_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: robot_private_port }
-
-  robot_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_medium }
-      name:
-        str_replace:
-          template: base-robot
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: robot_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: robot_vm_config }
-
-  robot_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/robot_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/robot_install.sh }
-        - path: /opt/robot_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/robot_vm_init.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: robot_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  robot_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: robot_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __network_name__: { get_attr: [oam_onap, name] }
-              __keystone_url__: { get_param: keystone_url }
-              __aai1_ip_addr__: { get_param: aai1_ip_addr }
-              __aai2_ip_addr__: { get_param: aai2_ip_addr }
-              __appc_ip_addr__: { get_param: appc_ip_addr }
-              __dcae_ip_addr__: { get_param: dcae_ip_addr }
-              __dcae_collector_ip__: { get_param: dcae_ip_addr }
-              __so_ip_addr__: { get_param: so_ip_addr }
-              __mr_ip_addr__: { get_param: mr_ip_addr }
-              __policy_ip_addr__: { get_param: policy_ip_addr }
-              __portal_ip_addr__: { get_param: portal_ip_addr }
-              __sdc_ip_addr__: { get_param: sdc_ip_addr }
-              __sdc_fe_ip_addr__: { get_param: sdc_ip_addr }
-              __sdc_be_ip_addr__: { get_param: sdc_ip_addr }
-              __sdc_be_onboard_ip_addr__: { get_param: sdc_ip_addr }
-              __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
-              __vid_ip_addr__: { get_param: vid_ip_addr }
-              __clamp_ip_addr__: { get_param: clamp_ip_addr }
-              __multiserv_ip_addr__: { get_param: multiserv_ip_addr }
-              __music_ip_addr__: { get_param: music_ip_addr }
-              __oof_ip_addr__: { get_param: oof_ip_addr }
-              __aaf_ip_addr__: { get_param: aaf_ip_addr }
-              __nbi_ip_addr__: { get_param: nbi_ip_addr }
-              __ubuntu_1404_image__: { get_param: ubuntu_1404_image }
-              __ubuntu_1604_image__: { get_param: ubuntu_1604_image }
-              __vm_image_name__: { get_param: ubuntu_1404_image }
-              __vm_flavor__: { get_param: flavor_medium }
-              __public_net_id__: { get_param: public_net_id }
-              __oam_network_id__: { get_resource: oam_onap }
-              __sec_group__: { get_resource: onap_sg }
-              __script_version__: { get_param: artifacts_version }
-              __docker_version__: { get_param: robot_docker }
-              __sniro_docker_version__: { get_param: sniro_docker }
-              __vnf_pub_key__: { get_param: pub_key }
-              __use_oam_net_for_robot__: { get_param: use_oam_net_for_robot }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              echo "__network_name__" > /opt/config/network.txt
-              ln -s /opt/config/openstack_region.txt /opt/config/region.txt
-              echo "__docker_version__" > /opt/config/docker_version.txt
-              echo "__sniro_docker_version__" > /opt/config/sniro_docker_version.txt
-              echo "__keystone_url__" > /opt/config/keystone.txt
-              echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
-              echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
-              echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt
-              echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
-              echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt
-              echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
-              # in HEAT install the components are on the same IP address but not for OOM
-              echo "__so_ip_addr__" > /opt/config/so_apihand_ip_addr.txt
-              echo "__so_ip_addr__" > /opt/config/so_asdchand_ip_addr.txt
-              echo "__so_ip_addr__" > /opt/config/so_bpmn_ip_addr.txt
-              echo "__so_ip_addr__" > /opt/config/so_catdb_ip_addr.txt
-              echo "__so_ip_addr__" > /opt/config/so_openstack_ip_addr.txt
-              echo "__so_ip_addr__" > /opt/config/so_reqdb_ip_addr.txt
-              echo "__so_ip_addr__" > /opt/config/so_sdnc_ip_addr.txt
-              echo "__so_ip_addr__" > /opt/config/so_vfc_ip_addr.txt
-              echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
-              echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
-              echo "__policy_ip_addr__" > /opt/config/policy_healthcheck_ip_addr.txt
-              echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
-              echo "__portal_ip_addr__" > /opt/config/cli_ip_addr.txt
-              echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
-              echo "__sdc_fe_ip_addr__" > /opt/config/sdc_fe_ip_addr.txt
-              echo "__sdc_be_ip_addr__" > /opt/config/sdc_be_ip_addr.txt
-              echo "__sdc_be_onboard_ip_addr__" > /opt/config/sdc_be_onboard_ip_addr.txt
-              echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
-              echo "__sdnc_ip_addr__" > /opt/config/sdnc_portal_ip_addr.txt
-              echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
-              echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt
-              echo "__multiserv_ip_addr__" > /opt/config/multiserv_ip_addr.txt
-              echo "__multiserv_ip_addr__" > /opt/config/msb_ip_addr.txt
-              ln -s /opt/config/msb_ip_addr.txt /opt/config/openo_ip_addr.txt # need this temporarily until testsuite docker image is released
-              echo "__multiserv_ip_addr__" > /opt/config/vnfsdk_ip_addr.txt
-              echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt
-              echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt
-              echo "__oof_ip_addr__" > /opt/config/oof_homing_ip_addr.txt
-              echo "__oof_ip_addr__" > /opt/config/oof_sniro_ip_addr.txt
-              echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt
-              echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt
-              echo "__vm_flavor__" > /opt/config/vm_flavor.txt
-              echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt
-              echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt
-              echo "__vm_image_name__" > /opt/config/vm_image_name.txt
-              echo "__script_version__" > /opt/config/script_version.txt
-              if [ "__use_oam_net_for_robot__" != "False" ] && [ "__use_oam_net_for_robot__" != "false" ]; then
-                echo "__oam_network_id__" > /opt/config/public_net_id.txt
-              else
-                echo "__public_net_id__" > /opt/config/public_net_id.txt
-              fi
-              echo "__oam_network_id__" > /opt/config/oam_network_id.txt
-              echo "__sec_group__" > /opt/config/sec_group.txt
-              echo "__use_oam_net_for_robot__" > /opt/config/use_oam_net_for_robot.txt
-              echo "__vnf_pub_key__" > /opt/config/vnf_pub_key.txt
-              echo "localhost" > /opt/config/log_elasticsearch_ip_addr.txt # these tests will be skipped by robot
-              echo "localhost" > /opt/config/log_logstash_ip_addr.txt # these tests will be skipped by robot
-              echo "localhost" > /opt/config/log_kibana_ip_addr.txt # these tests will be skipped by robot
-
-              cd /opt
-              ./robot_install.sh
-
-
-  # VID instantiation
-  vid_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: vid_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  vid_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: vid_private_port }
-
-  vid_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_medium }
-      name:
-        str_replace:
-          template: base-vid
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: vid_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: vid_vm_config }
-
-  vid_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/vid_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/vid_install.sh }
-        - path: /opt/vid_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/vid_vm_init.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: vid_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  vid_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: vid_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __docker_version__: { get_param: vid_docker }
-              __gerrit_branch__: { get_param: vid_branch }
-              __vid_repo__: { get_param: vid_repo }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              echo "__docker_version__" > /opt/config/docker_version.txt
-              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-              echo "__vid_repo__" > /opt/config/remote_repo.txt
-
-              cd /opt
-              ./vid_install.sh
-
-
-  # SDN-C instantiation
-  sdnc_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: sdnc_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  sdnc_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: sdnc_private_port }
-
-  sdnc_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace:
-          template: base-sdnc
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: sdnc_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: sdnc_vm_config }
-
-  sdnc_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/sdnc_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/sdnc_install.sh }
-        - path: /opt/sdnc_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/sdnc_vm_init.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: sdnc_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  sdnc_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: sdnc_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __docker_version__: { get_param: sdnc_docker }
-              __gerrit_branch__: { get_param: sdnc_branch }
-              __dgbuilder_docker__: { get_param: dgbuilder_docker }
-              __sdnc_repo__: { get_param: sdnc_repo }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              echo "__docker_version__" > /opt/config/docker_version.txt
-              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-              echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt
-              echo "__sdnc_repo__" > /opt/config/remote_repo.txt
-
-              cd /opt
-              ./sdnc_install.sh
-
-
-  # SDC instantiation
-  sdc_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: sdc_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  sdc_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: sdc_private_port }
-
-  sdc_volume_data:
-    type: OS::Cinder::Volume
-    properties:
-      name: vol1-sdc-data
-      size: 100
-
-  sdc_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_xlarge }
-      name:
-        str_replace:
-          template: base-sdc
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: sdc_private_port }
-      block_device_mapping:
-        - device_name: /dev/vdb
-          volume_id: {get_resource: sdc_volume_data}
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: sdc_vm_config }
-
-  sdc_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/sdc_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/sdc_install.sh }
-        - path: /opt/sdc_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/sdc_vm_init.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: sdc_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  sdc_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: sdc_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __env_name__: { get_param: dmaap_topic }
-              __mr_ip_addr__: { get_param: mr_ip_addr }
-              __private_ip__: { get_param: sdc_ip_addr }
-              __docker_version__: { get_param: sdc_docker }
-              __sdc_wfd_docker__: { get_param: sdc_wfd_docker }
-              __gerrit_branch__: { get_param: sdc_branch }
-              __sdc_repo__: { get_param: sdc_repo }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              echo "__env_name__" > /opt/config/env_name.txt
-              echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
-              echo "__private_ip__" > /opt/config/private_ip.txt
-              echo "__docker_version__" > /opt/config/docker_version.txt
-              echo "__sdc_wfd_docker__" > /opt/config/sdc_wfd_docker.txt
-              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-              echo "__sdc_repo__" > /opt/config/remote_repo.txt
-
-              cd /opt
-              ./sdc_install.sh
-
-
-  # PORTAL instantiation
-  portal_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: portal_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  portal_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: portal_private_port }
-
-  portal_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace:
-          template: base-portal
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: portal_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: portal_vm_config }
-
-  portal_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/portal_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/portal_install.sh }
-        - path: /opt/portal_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/portal_vm_init.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: portal_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  portal_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: portal_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __public_ip__: { get_attr: [portal_floating_ip, floating_ip_address] }
-              __docker_version__: { get_param: portal_docker }
-              __gerrit_branch__: { get_param: portal_branch }
-              __cli_docker__: { get_param: cli_docker }
-              __portal_repo__: { get_param: portal_repo }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              echo "__public_ip__" > /opt/config/public_ip.txt
-              echo "__docker_version__" > /opt/config/docker_version.txt
-              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-              echo "__cli_docker__" > /opt/config/cli_docker_version.txt
-              echo "__portal_repo__" > /opt/config/remote_repo.txt
-
-              cd /opt
-              ./portal_install.sh
-
-
-  # Policy Engine instantiation
-  policy_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: policy_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  policy_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: policy_private_port }
-
-  policy_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_xlarge }
-      name:
-        str_replace:
-          template: base-policy
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: policy_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: policy_vm_config }
-
-  policy_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/policy_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/policy_install.sh }
-        - path: /opt/policy_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/policy_vm_init.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: policy_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  policy_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: policy_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __public_ip__: { get_attr: [policy_floating_ip, floating_ip_address] }
-              __docker_version__: { get_param: policy_docker }
-              __gerrit_branch__: { get_param: policy_branch }
-              __policy_repo__: { get_param: policy_repo }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              echo "__public_ip__" > /opt/config/public_ip.txt
-              echo "__docker_version__" > /opt/config/docker_version.txt
-              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-              echo "__policy_repo__" > /opt/config/remote_repo.txt
-
-              cd /opt
-              ./policy_install.sh
-
-
-  # APP-C instantiation
-  appc_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: appc_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  appc_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: appc_private_port }
-
-  appc_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace:
-          template: base-appc
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: appc_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: appc_vm_config }
-
-  appc_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/appc_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/appc_install.sh }
-        - path: /opt/appc_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/appc_vm_init.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: appc_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  appc_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: appc_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __dmaap_topic__: { get_param: dmaap_topic }
-              __docker_version__: { get_param: appc_docker }
-              __gerrit_branch__: { get_param: appc_branch }
-              __dgbuilder_docker__: { get_param: dgbuilder_docker }
-              __ansible_docker__: { get_param: ansible_docker }
-              __appc_repo__: { get_param: appc_repo }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              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 "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt
-              echo "__ansible_docker__" > /opt/config/ansible_version.txt
-              echo "__appc_repo__" > /opt/config/remote_repo.txt
-
-              cd /opt
-              ./appc_install.sh
-
-
-  # CLAMP instantiation
-  clamp_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: clamp_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  clamp_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: clamp_private_port }
-
-  clamp_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace:
-          template: base-clamp
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: clamp_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: clamp_vm_config }
-
-  clamp_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/clamp_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/clamp_install.sh }
-        - path: /opt/clamp_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/clamp_vm_init.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: clamp_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  clamp_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: clamp_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __keystone_url__: { get_param: keystone_url }
-              __dmaap_topic__: { get_param: dmaap_topic }
-              __docker_version__: { get_param: clamp_docker }
-              __gerrit_branch__: { get_param: clamp_branch }
-              __clamp_repo__: { get_param: clamp_repo }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-              ln -s /opt/config/openstack_tenant_id.txt /opt/config/tenant_id.txt
-              echo "__keystone_url__" > /opt/config/keystone.txt
-              echo "__docker_version__" > /opt/config/docker_version.txt
-              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-              echo "__clamp_repo__" > /opt/config/remote_repo.txt
-
-              cd /opt
-              ./clamp_install.sh
-
-
-  # MultiService VM instantiation
-  multiserv_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: multiserv_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  multiserv_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: multiserv_private_port }
-
-  multiserv_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_xlarge }
-      name:
-        str_replace:
-          template: base-multi-service
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: multiserv_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: multiserv_vm_config }
-
-  multiserv_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/multiserv_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/multiserv_install.sh }
-        - path: /opt/cli_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/cli_install.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: multiserv_all_serv.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  multiserv_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: multiserv_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __oam_network_cidr__: { get_param: oam_network_cidr }
-              __aai1_ip_addr__: { get_param: aai1_ip_addr }
-              __aai2_ip_addr__: { get_param: aai2_ip_addr }
-              __appc_ip_addr__: { get_param: appc_ip_addr }
-              __dcae_ip_addr__: { get_param: dcae_ip_addr }
-              __so_ip_addr__: { get_param: so_ip_addr }
-              __mr_ip_addr__: { get_param: mr_ip_addr }
-              __policy_ip_addr__: { get_param: policy_ip_addr }
-              __portal_ip_addr__: { get_param: portal_ip_addr }
-              __robot_ip_addr__: { get_param: robot_ip_addr }
-              __sdc_ip_addr__: { get_param: sdc_ip_addr }
-              __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
-              __vid_ip_addr__: { get_param: vid_ip_addr }
-              __clamp_ip_addr__: { get_param: clamp_ip_addr }
-              __multiserv_ip_addr__: { get_param: multiserv_ip_addr }
-              __vnfsdk_branch__: { get_param: vnfsdk_branch }
-              __msb_docker__: { get_param: msb_docker }
-              __mvim_docker__: { get_param: mvim_docker }
-              __mvim_openstack_docker__: { get_param: mvim_openstack_docker }
-              __uui_docker__: { get_param: uui_docker }
-              __esr_docker__: { get_param: esr_docker }
-              __vnfsdk_repo__: { get_param: vnfsdk_repo }
-              __vfc_db_docker__: { get_param: vfc_db_docker }
-              __vfc_nokia_docker__: { get_param: vfc_nokia_docker }
-              __vfc_nokiav2_docker__: { get_param: vfc_nokiav2_docker }
-              __vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
-              __vfc_multivimproxy_docker__: { get_param: vfc_multivimproxy_docker }
-              __vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker }
-              __vfc_vnfres_docker__: { get_param: vfc_vnfres_docker }
-              __vfc_vnfmgr_docker__: { get_param: vfc_vnfmgr_docker }
-              __vfc_vnflcm_docker__: { get_param: vfc_vnflcm_docker }
-              __vfc_resmanagement_docker__: { get_param: vfc_resmanagement_docker }
-              __vfc_nslcm_docker__: { get_param: vfc_nslcm_docker }
-              __vfc_huawei_docker__: { get_param: vfc_huawei_docker }
-              __vfc_jujudriver_docker__: { get_param: vfc_jujudriver_docker }
-              __vfc_gvnfmdriver_docker__: { get_param: vfc_gvnfmdriver_docker }
-              __vfc_emsdriver_docker__: { get_param: vfc_emsdriver_docker }
-              __vfc_catalog_docker__: { get_param: vfc_catalog_docker }
-              __vfc_wfengine_mgrservice_docker__: { get_param: vfc_wfengine_mgrservice_docker }
-              __vfc_wfengine_activiti_docker__: { get_param: vfc_wfengine_activiti_docker }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-              echo "__vnfsdk_branch__" > /opt/config/vnfsdk_branch.txt
-              echo "__msb_docker__" > /opt/config/msb_docker.txt
-              echo "__mvim_docker__" > /opt/config/mvim_docker.txt
-              echo "__mvim_openstack_docker__" > /opt/config/mvim_openstack_docker.txt
-              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 "export DB_DOCKER_VER=__vfc_db_docker__" >> /opt/config/vfc_docker.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
-              echo "export MULTIVIMPROXY_DOCKER_VER=__vfc_multivimproxy_docker__" >> /opt/config/vfc_docker.txt
-              echo "export ZTEVNFMDRIVER_DOCKER_VER=__vfc_ztevnfmdriver_docker__" >> /opt/config/vfc_docker.txt
-              echo "export ZTESDNCDRIVER_DOCKER_VER=__vfc_ztesdncdriver_docker__" >> /opt/config/vfc_docker.txt
-              echo "export VNFRES_DOCKER_VER=__vfc_vnfres_docker__" >> /opt/config/vfc_docker.txt
-              echo "export VNFMGR_DOCKER_VER=__vfc_vnfmgr_docker__" >> /opt/config/vfc_docker.txt
-              echo "export VNFLCM_DOCKER_VER=__vfc_vnflcm_docker__" >> /opt/config/vfc_docker.txt
-              echo "export RESMANAGEMENT_DOCKER_VER=__vfc_resmanagement_docker__" >> /opt/config/vfc_docker.txt
-              echo "export NSLCM_DOCKER_VER=__vfc_nslcm_docker__" >> /opt/config/vfc_docker.txt
-              echo "export HUAWEI_DOCKER_VER=__vfc_huawei_docker__" >> /opt/config/vfc_docker.txt
-              echo "export JUJUDRIVER_DOCKER_VER=__vfc_jujudriver_docker__" >> /opt/config/vfc_docker.txt
-              echo "export GVNFMDRIVER_DOCKER_VER=__vfc_gvnfmdriver_docker__" >> /opt/config/vfc_docker.txt
-              echo "export EMSDRIVER_DOCKER_VER=__vfc_emsdriver_docker__" >> /opt/config/vfc_docker.txt
-              echo "export CATALOG_DOCKER_VER=__vfc_catalog_docker__" >> /opt/config/vfc_docker.txt
-              echo "export MGRSERVICE_DOCKER_VER=__vfc_wfengine_mgrservice_docker__" >> /opt/config/vfc_docker.txt
-              echo "export ACTIVITI_DOCKER_VER=__vfc_wfengine_activiti_docker__" >> /opt/config/vfc_docker.txt
-
-              # Create env file with the IP address of all ONAP components
-              echo "export AAI_IP1=__aai1_ip_addr__" >> /opt/config/onap_ips.txt
-              echo "export AAI_IP2=__aai2_ip_addr__" >> /opt/config/onap_ips.txt
-              echo "export APPC_IP=__appc_ip_addr__" >> /opt/config/onap_ips.txt
-              echo "export DCAE_IP=__dcae_ip_addr__" >> /opt/config/onap_ips.txt
-              echo "export SO_IP=__so_ip_addr__" >> /opt/config/onap_ips.txt
-              echo "export MR_IP=__mr_ip_addr__" >> /opt/config/onap_ips.txt
-              echo "export POLICY_IP=__policy_ip_addr__" >> /opt/config/onap_ips.txt
-              echo "export PORTAL_IP=__portal_ip_addr__" >> /opt/config/onap_ips.txt
-              echo "export ROBOT_IP=__robot_ip_addr__" >> /opt/config/onap_ips.txt
-              echo "export SDC_IP=__sdc_ip_addr__" >> /opt/config/onap_ips.txt
-              echo "export SDNC_IP=__sdnc_ip_addr__" >> /opt/config/onap_ips.txt
-              echo "export VID_IP=__vid_ip_addr__" >> /opt/config/onap_ips.txt
-              echo "export CLAMP_IP=__clamp_ip_addr__" >> /opt/config/onap_ips.txt
-              echo "export MULTISERV_IP=__multiserv_ip_addr__" >> /opt/config/onap_ips.txt
-
-              cd /opt
-              ./multiserv_install.sh
-
-
-  # DCAE GEN 2 Controller instantiation
-  dcae_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  dcae_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: dcae_private_port }
-
-  dcae_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_xlarge }
-      name:
-        str_replace:
-          template: base-dcae
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: dcae_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: dcae_vm_config }
-
-  dcae_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/dcae2_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/dcae2_install.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: dcae2_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  dcae_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: dcae_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __rand_str__: { get_resource: random-str }
-              # repo related
-              __docker_version__: { get_param: dcae_docker }
-              # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs
-              __dcae_deployment_profile__: { get_param: dcae_deployment_profile }
-              __mac_addr__: { get_attr: [dcae_private_port, mac_address] }
-              __dcae_ip_addr__: { get_param: dcae_ip_addr }
-              __dcae_float_ip__: { get_attr: [dcae_floating_ip, floating_ip_address] }
-              # fixed private IPs
-              __mr_ip_addr__: { get_param: mr_ip_addr }
-              __policy_ip_addr__: { get_param: policy_ip_addr }
-              __sdc_ip_addr__: { get_param: sdc_ip_addr }
-              __multiserv_ip_addr__: { get_param: multiserv_ip_addr }
-              __aai1_ip_addr__: { get_param: aai1_ip_addr }
-              __aai2_ip_addr__: { get_param: aai2_ip_addr }
-              # floating IPs
-              __dns_floating_ip_addr__: { get_attr: [dns_floating_ip, floating_ip_address] }
-              __aai1_floating_ip_addr__: { get_attr: [aai1_floating_ip, floating_ip_address] }
-              __aai2_floating_ip_addr__: { get_attr: [aai2_floating_ip, floating_ip_address] }
-              __mrouter_floating_ip_addr__: { get_attr: [mrouter_floating_ip, floating_ip_address] }
-              __sdc_floating_ip_addr__: { get_attr: [sdc_floating_ip, floating_ip_address] }
-              __policy_floating_ip_addr__: { get_attr: [policy_floating_ip, floating_ip_address] }
-              __multiserv_floating_ip_addr__: { get_attr: [multiserv_floating_ip, floating_ip_address] }
-              __dcae_floating_ip_addr__: { get_attr: [dcae_floating_ip, floating_ip_address] }
-              # container versions
-              __dcae_docker__:  { get_param: dcae_docker }
-              __dcae_bootstrap_docker__:  { get_param: dcae_bootstrap_docker }
-              __dcae_k8sbootstrap_docker__:  { get_param: dcae_k8sbootstrap_docker }
-              __dcae_redisc_docker__:  { get_param: dcae_redisc_docker }
-              __dcae_hc_docker__:  { get_param: dcae_hc_docker }
-              __dcae_tls_docker__:  { get_param: dcae_tls_docker }
-              __dcae_cb_docker__:  { get_param: dcae_cb_docker }
-              __dcae_snmptrap_docker__:  { get_param: dcae_snmptrap_docker }
-              __dcae_ves_docker__:  { get_param: dcae_ves_docker }
-              __dcae_hvves_docker__: { get_param: dcae_hvves_docker }
-              __dcae_datafile_docker__: { get_param: dcae_datafile_docker }
-              __dcae_cm_docker__:  { get_param: dcae_cm_docker }
-              __dcae_tca_docker__:  { get_param: dcae_tca_docker }
-              __dcae_tca2_docker__:  { get_param: dcae_tca2_docker }
-              __dcae_cbs_docker__:  { get_param: dcae_cbs_docker }
-              __dcae_dh_docker__:  { get_param: dcae_dh_docker }
-              __dcae_inv_docker__:  { get_param: dcae_inv_docker }
-              __dcae_ph_docker__:  { get_param: dcae_ph_docker }
-              __dcae_sch_docker__:  { get_param: dcae_sch_docker }
-              __dcae_prh_docker__:  { get_param: dcae_prh_docker }
-              __dcae_heartbeat_docker__:  { get_param: dcae_heartbeat_docker }
-              __dcae_mua_docker__:  { get_param: dcae_mua_docker }
-              __dcae_msnmp_docker__:  { get_param: dcae_msnmp_docker }
-              __holmes_em_docker__:  { get_param: holmes_em_docker }
-              __holmes_rm_docker__:  { get_param: holmes_rm_docker }
-  
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              echo "__rand_str__" > /opt/config/dcae_zone.txt
-              echo "__rand_str__" > /opt/config/rand_str.txt
-              # repo related
-              echo "__docker_version__" > /opt/config/docker_version.txt
-              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-              # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs
-              echo "__dcae_deployment_profile__" > /opt/config/dcae_deployment_profile.txt
-              echo "__mac_addr__" > /opt/config/mac_addr.txt
-              echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
-              # fixed private IP addresses of other ONAP components
-              echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
-              echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
-              echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
-              echo "__multiserv_ip_addr__" > /opt/config/multiserv_ip_addr.txt
-              echo "__multiserv_ip_addr__" > /opt/config/msb_ip_addr.txt
-              echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
-              echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
-              # floating IPs
-              echo "__dns_floating_ip_addr__" > /opt/config/dns_floating_ip_addr.txt
-              echo "__aai1_floating_ip_addr__" > /opt/config/aai1_floating_ip_addr.txt
-              echo "__aai2_floating_ip_addr__" > /opt/config/aai2_floating_ip_addr.txt
-              echo "__mrouter_floating_ip_addr__" > /opt/config/mrouter_floating_ip_addr.txt
-              echo "__sdc_floating_ip_addr__" > /opt/config/sdc_floating_ip_addr.txt
-              echo "__policy_floating_ip_addr__" > /opt/config/policy_floating_ip_addr.txt
-              echo "__multiserv_floating_ip_addr__" > /opt/config/multiserv_floating_ip_addr.txt
-              echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt
-              # container versions
-              echo "__dcae_docker__" > /opt/config/dcae_docker.txt
-              echo "__dcae_bootstrap_docker__" > /opt/config/dcae_docker_bootstrap.txt
-              echo "__dcae_k8sbootstrap_docker__" > /opt/config/dcae_docker_k8sbootstrap.txt
-              echo "__dcae_redisc_docker__" > /opt/config/dcae_docker_redisc.txt
-              echo "__dcae_hc_docker__" > /opt/config/dcae_docker_hc.txt
-              echo "__dcae_tls_docker__" > /opt/config/dcae_docker_tls.txt
-              echo "__dcae_cb_docker__" > /opt/config/dcae_docker_cb.txt
-              echo "__dcae_snmptrap_docker__" > /opt/config/dcae_docker_snmptrap.txt
-              echo "__dcae_ves_docker__" > /opt/config/dcae_docker_ves.txt
-              echo "__dcae_hvves_docker__" > /opt/config/dcae_docker_hvves.txt
-              echo "__dcae_datafile_docker__" > /opt/config/dcae_docker_datafile.txt
-              echo "__dcae_cm_docker__" > /opt/config/dcae_docker_cm.txt
-              echo "__dcae_tca_docker__" > /opt/config/dcae_docker_tca.txt
-              echo "__dcae_tca2_docker__" > /opt/config/dcae_docker_tca2.txt
-              echo "__dcae_cbs_docker__" > /opt/config/dcae_docker_cbs.txt
-              echo "__dcae_dh_docker__" > /opt/config/dcae_docker_dh.txt
-              echo "__dcae_inv_docker__" > /opt/config/dcae_docker_inv.txt
-              echo "__dcae_ph_docker__" > /opt/config/dcae_docker_ph.txt
-              echo "__dcae_sch_docker__" > /opt/config/dcae_docker_sch.txt
-              echo "__dcae_prh_docker__" > /opt/config/dcae_docker_prh.txt
-              echo "__dcae_heartbeat_docker__" > /opt/config/dcae_docker_heartbeat.txt
-              echo "__dcae_mua_docker__" > /opt/config/dcae_docker_mua.txt
-              echo "__dcae_msnmp_docker__" > /opt/config/dcae_docker_msnmp.txt
-              echo "__holmes_em_docker__" > /opt/config/holmes_docker_em.txt
-              echo "__holmes_rm_docker__" > /opt/config/holmes_docker_rm.txt
-
-              cd /opt
-              ./dcae2_install.sh 2>&1 | tee -a /tmp/dcae2_install.log
-
-
-  # MUSIC instantiation
-  music_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: music_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  music_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: music_private_port }
-
-  music_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace:
-          template: base-music
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: music_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: music_vm_config }
-
-  music_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/music_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/music_install.sh }
-        - path: /opt/music_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/music_vm_init.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: music_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  music_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: music_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __docker_version__: { get_param: music_docker }
-              __music_repo__: { get_param: music_repo }
-              __gerrit_branch__: { get_param: music_branch }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              echo "__docker_version__" > /opt/config/docker_version.txt
-              echo "__music_repo__" > /opt/config/remote_repo.txt
-              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-
-              cd /opt
-              ./music_install.sh
-
-
-  # OOF instantiation
-  oof_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: oof_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  oof_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: oof_private_port }
-
-  oof_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace:
-          template: base-oof
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: oof_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: oof_vm_config }
-
-  oof_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/oof_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/oof_install.sh }
-        - path: /opt/oof_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/oof_vm_init.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: oof_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  oof_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: oof_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __has_docker_version__: { get_param: optf_has_docker }
-              __osdf_docker_version__: { get_param: optf_osdf_docker }
-              __music_docker_version__: { get_param: music_docker }
-              __cass_music_docker_version__: { get_param: cassandra_music_docker }
-              __oof_repo__: { get_param: oof_repo }
-              __gerrit_branch__: { get_param: oof_branch }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              echo "__has_docker_version__" > /opt/config/has_docker_version.txt
-              echo "__osdf_docker_version__" > /opt/config/osdf_docker_version.txt
-              echo "__music_docker_version__" > /opt/config/music_version.txt
-              echo "__cass_music_docker_version__" > /opt/config/cass_version.txt
-              echo "__oof_repo__" > /opt/config/remote_repo.txt
-              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-
-              cd /opt
-              ./oof_install.sh
-
-
-  # AAF instantiation
-  aaf_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: aaf_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  aaf_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: aaf_private_port }
-
-  aaf_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_medium }
-      name:
-        str_replace:
-          template: base-aaf
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: aaf_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: aaf_vm_config }
-
-  aaf_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/aaf_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/aaf_install.sh }
-        - path: /opt/aaf_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/aaf_vm_init.sh }
-        - path: /opt/config/sample_ca/aaf.signer.b64
-          permissions: '0600'
-          content: { get_file: cloud-config/sample_ca/aaf.signer.b64 }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: aaf_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  aaf_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: aaf_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __docker_version__: { get_param: aaf_docker }
-              __aaf_repo__: { get_param: aaf_repo }
-              __gerrit_branch__: { get_param: aaf_branch }
-              __public_ip__: { get_attr: [aaf_floating_ip, floating_ip_address] }
-              __local_ip__: { get_param: aaf_ip_addr }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              mkdir -p /opt/config/sample_ca
-              echo "__docker_version__" > /opt/config/docker_version.txt
-              echo "__aaf_repo__" > /opt/config/remote_repo.txt
-              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-              echo "__public_ip__" > /opt/config/public_ip.txt
-              echo "__local_ip__" > /opt/config/local_ip.txt
-
-              cd /opt
-              ./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: SOFTWARE_CONFIG
-      user_data: { get_resource: sms_vm_config }
-
-  sms_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/sms_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/sms_install.sh }
-        - path: /opt/sms_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/sms_vm_init.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: sms_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  sms_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: sms_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __docker_version__: { get_param: sms_docker }
-              __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
-              echo "__docker_version__" > /opt/config/docker_version.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
-
-              cd /opt
-              ./sms_install.sh
-
-
-  # NBI instantiation
-  nbi_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: nbi_ip_addr }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  nbi_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: nbi_private_port }
-
-  nbi_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_small }
-      name:
-        str_replace:
-          template: base-nbi
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: nbi_private_port }
-      user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: nbi_vm_config }
-
-  nbi_vm_scripts:
-    type: OS::Heat::CloudConfig
-    properties:
-      cloud_config:
-        write_files:
-        - path: /opt/nbi_install.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/nbi_install.sh }
-        - path: /opt/nbi_vm_init.sh
-          permissions: '0755'
-          content: { get_file: cloud-config/nbi_vm_init.sh }
-        - path: /etc/init.d/serv.sh
-          permissions: '0755'
-          content:
-            str_replace:
-              params:
-                __vm_init_script__: nbi_vm_init.sh
-              template:
-                get_file: cloud-config/serv.sh
-
-  nbi_vm_config:
-    type: OS::Heat::MultipartMime
-    properties:
-      parts:
-      - config: { get_resource: common_config_script }
-      - config: { get_resource: nbi_vm_scripts }
-      - config:
-          str_replace:
-            params:
-              __docker_version__: { get_param: nbi_docker }
-              __nbi_repo__: { get_param: nbi_repo }
-              __gerrit_branch__: { get_param: nbi_branch }
-              __sdc_ip_addr__: { get_param: sdc_ip_addr }
-              __aai1_ip_addr__: { get_param: aai1_ip_addr }
-              __so_ip_addr__: { get_param: so_ip_addr }
-            template: |
-              #!/bin/bash
-
-              # Create configuration files
-              echo "__docker_version__" > /opt/config/docker_version.txt
-              echo "__nbi_repo__" > /opt/config/remote_repo.txt
-              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-              echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
-              echo "__aai1_ip_addr__" > /opt/config/aai_ip_addr.txt
-              echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
-
-              cd /opt
-              ./nbi_install.sh
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
deleted file mode 100644 (file)
index 2916c34..0000000
+++ /dev/null
@@ -1,220 +0,0 @@
-parameters:
-
-  ##############################################
-  #                                            #
-  # Parameters used across all ONAP components #
-  #                                            #
-  ##############################################
-
-  public_net_id: PUT YOUR NETWORK ID HERE
-
-  public_net_name: PUT YOUR NETWORK NAME HERE
-
-  ubuntu_1404_image: PUT THE UBUNTU 14.04 IMAGE NAME HERE
-
-  ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE
-
-  flavor_small: PUT THE SMALL FLAVOR NAME HERE
-
-  flavor_medium: PUT THE MEDIUM FLAVOR NAME HERE
-
-  flavor_large: PUT THE LARGE FLAVOR NAME HERE
-
-  flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
-
-  vm_base_name: onap
-
-  key_name: onap_key
-
-  pub_key: PUT YOUR PUBLIC KEY HERE
-
-  nexus_docker_repo: nexus3.onap.org:10001
-
-  nexus_username: docker
-
-  nexus_password: docker
-
-  dmaap_topic: AUTO
-
-  artifacts_version: 1.3.0-SNAPSHOT
-
-  openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
-
-  openstack_tenant_name: PUT YOUR OPENSTACK PROJECT NAME HERE
-
-  openstack_username: PUT YOUR OPENSTACK USERNAME HERE
-
-  openstack_api_key: PUT YOUR ENCRYPTED OPENSTACK PASSWORD HERE
-
-  openstack_region: RegionOne
-
-  keystone_url: PUT THE KEYSTONE URL HERE (do not include version number)
-
-  cloud_env: openstack
-
-  http_proxy: PUT YOUR HTTP PROXY ADDRESS (if you don't work behind a proxy put no_proxy)
-
-  https_proxy: PUT YOUR HTTPS PROXY ADDRESS (if you don't work behind a proxy put no_proxy)
-
-
-  ######################
-  #                    #
-  # Network parameters #
-  #                    #
-  ######################
-
-  dns_list: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems)
-  external_dns: PUT THE FIRST ADDRESS OF THE EXTERNAL DNS LIST HERE
-  dns_forwarder: PUT THE IP OF DNS FORWARDER FOR ONAP DEPLOYMENT'S OWN DNS SERVER
-  oam_network_cidr: 10.0.0.0/16
-
-  ### Private IP addresses ###
-
-  aai1_ip_addr: 10.0.1.1
-  aai2_ip_addr: 10.0.1.2
-  appc_ip_addr: 10.0.2.1
-  dcae_ip_addr: 10.0.4.1
-  dns_ip_addr: 10.0.100.1
-  so_ip_addr: 10.0.5.1
-  mr_ip_addr: 10.0.11.1
-  policy_ip_addr: 10.0.6.1
-  portal_ip_addr: 10.0.9.1
-  robot_ip_addr: 10.0.10.1
-  sdc_ip_addr: 10.0.3.1
-  sdnc_ip_addr: 10.0.7.1
-  vid_ip_addr: 10.0.8.1
-  clamp_ip_addr: 10.0.12.1
-  multiserv_ip_addr: 10.0.14.1
-  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
-
-  ###########################
-  #                         #
-  # Parameters used by DCAE #
-  #                         #
-  ###########################
-
-  dcae_deployment_profile: PUT DCAE DEPLOYMENT PROFILE (R3MVP, R3, or R3PLUS)
-
-  ################################
-  #                              #
-  # Docker versions and branches #
-  # Generated using onap_openstack_template.env and manifest-to-env.sh
-  #                              #
-  ################################
-
-  aai_branch: master
-  appc_branch: master
-  so_branch: master
-  mr_branch: master
-  policy_branch: master
-  portal_branch: master
-  sdc_branch: master
-  sdnc_branch: master
-  vid_branch: master
-  clamp_branch: master
-  vnfsdk_branch: master
-  music_branch: master
-  nbi_branch: master
-  aaf_branch: master
-  sms_branch: master
-  oof_branch: master
-
-  aai_docker: "${AAI_RESOURCES_DOCKER}"
-  appc_docker: "${APPC_IMAGE_DOCKER}"
-  so_docker: "${API_HANDLER_INFRA_DOCKER}"
-  policy_docker: "${POLICY_PE_DOCKER}"
-  portal_docker: "${PORTAL_APP_DOCKER}"
-  robot_docker: "${TESTSUITE_DOCKER}"
-  sniro_docker: "${SNIROEMULATOR_DOCKER}"
-  sdc_docker: "${SDC_BACKEND_DOCKER}"
-  sdnc_docker: "${SDNC_IMAGE_DOCKER}"
-  vid_docker: "${VID_DOCKER}"
-  clamp_docker: "${CLAMP_DOCKER}"
-  msb_docker: "${MSB_APIGATEWAY_DOCKER}"
-  mvim_docker: "${FRAMEWORK_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}"
-  dgbuilder_docker: "${CCSDK_DGBUILDER_IMAGE_DOCKER}"
-  ansible_docker: "${CCSDK_ANSIBLE_IMAGE_DOCKER}"
-  cli_docker: "${CLI_DOCKER}"
-  music_docker: "${MUSIC_DOCKER}"
-  cassandra_music_docker: "${CASSANDRA_MUSIC_DOCKER}"
-  optf_has_docker: "${OPTF_HAS_DOCKER}"
-  optf_osdf_docker: "${OPTF_OSDF_DOCKER}"
-  aaf_docker: "${AAF_SERVICE_DOCKER}"
-  sms_docker: "${SMS_DOCKER}"
-  nbi_docker: "${NBI_DOCKER}"
-  dbcl_docker: "${BUSCONTROLLER_DOCKER}"
-
-  dcae_docker: "${BOOTSTRAP_DOCKER}"
-  dcae_bootstrap_docker: "${BOOTSTRAP_DOCKER}"
-  dcae_k8sbootstrap_docker: "${K8S_BOOTSTRAP_CONTAINER_DOCKER}"
-  dcae_redisc_docker: "${REDIS_CLUSTER_CONTAINER_DOCKER}"
-  dcae_hc_docker: "${HEALTHCHECK_CONTAINER_DOCKER}"
-  dcae_tls_docker: "${TLS_INIT_CONTAINER_DOCKER}"
-  dcae_cb_docker: "${CDAPBROKER_DOCKER}"
-  dcae_snmptrap_docker: "${SNMPTRAP_DOCKER}"
-  dcae_ves_docker: "${VESCOLLECTOR_DOCKER}"
-  dcae_hvves_docker: "${HV_COLLECTOR_MAIN_DOCKER}"
-  dcae_datafile_docker: "${DATAFILE_APP_SERVER_DOCKER}"
-  dcae_cm_docker: "${CM_CONTAINER_DOCKER}"
-  dcae_tca_docker: "${TCA_CDAP_CONTAINER_DOCKER}"
-  dcae_tca2_docker: "${DCAE_ANALYTICS_TCA_WEB_DOCKER}"
-  dcae_cbs_docker: "${APP_APP_DOCKER}"
-  dcae_dh_docker: "${DEPLOYMENT_HANDLER_DOCKER}"
-  dcae_inv_docker: "${INVENTORY_API_DOCKER}"
-  dcae_ph_docker: "${POLICY_HANDLER_DOCKER}"
-  dcae_sch_docker: "${SERVICECHANGE_HANDLER_DOCKER}"
-  dcae_prh_docker: "${PRH_APP_SERVER_DOCKER}"
-  dcae_heartbeat_docker: "${HEARTBEAT_DOCKER}"
-  dcae_mua_docker: "${UNIVERSALVESADAPTOR_DOCKER}"
-  dcae_msnmp_docker: "${SNMPMAPPER_DOCKER}"
-  holmes_rm_docker: "${RULE_MANAGEMENT_DOCKER}"
-  holmes_em_docker: "${ENGINE_MANAGEMENT_DOCKER}"
-
-  vfc_db_docker: "${DB_DOCKER}"
-  vfc_nokia_docker: "${NOKIA_DOCKER}"
-  vfc_nokiav2_docker: "${NOKIAV2_DOCKER}"
-  vfc_ztevnfmdriver_docker: "${ZTEVNFMDRIVER_DOCKER}"
-  vfc_ztesdncdriver_docker: "${ZTESDNCDRIVER_DOCKER}"
-  vfc_vnfres_docker: "${VNFRES_DOCKER}"
-  vfc_vnfmgr_docker: "${VNFMGR_DOCKER}"
-  vfc_vnflcm_docker: "${VNFLCM_DOCKER}"
-  vfc_resmanagement_docker: "${RESMANAGEMENT_DOCKER}"
-  vfc_nslcm_docker: "${NSLCM_DOCKER}"
-  vfc_huawei_docker: "${HUAWEI_DOCKER}"
-  vfc_jujudriver_docker: "${JUJUDRIVER_DOCKER}"
-  vfc_gvnfmdriver_docker: "${GVNFMDRIVER_DOCKER}"
-  vfc_emsdriver_docker: "${EMSDRIVER_DOCKER}"
-  vfc_catalog_docker: "${CATALOG_DOCKER}"
-  vfc_wfengine_mgrservice_docker: "${WFENGINE_MGRSERVICE_DOCKER}"
-  vfc_wfengine_activiti_docker: "${WFENGINE_ACTIVITI_DOCKER}"
-  vfc_multivimproxy_docker: "${MULTIVIMPROXY_DOCKER}"
-
-  #####################
-  #                   #
-  # ONAP repositories #
-  #                   #
-  #####################
-  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
-  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
-  sdc_repo: http://gerrit.onap.org/r/sdc.git
-  sdnc_repo: http://gerrit.onap.org/r/sdnc/oam.git
-  vid_repo: http://gerrit.onap.org/r/vid.git
-  clamp_repo: http://gerrit.onap.org/r/clamp.git
-  vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git
-  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/openstack_encrypted_key.sh b/heat/ONAP/openstack_encrypted_key.sh
deleted file mode 100755 (executable)
index 20910fa..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-usage () {
-  echo "Usage:"
-  echo "   ./$(basename $0) your_openstack_password"
-  exit 1
-}
-
-if [ "$#" -ne 1 ]; then
-  echo "Wrong number of input parameters"
-  usage
-fi
-
-SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f
-OPENSTACK_API_KEY=$1
-
-echo -n "$OPENSTACK_API_KEY" | openssl aes-128-ecb -e -K $SO_ENCRYPTION_KEY -nosalt | xxd -c 256 -p