aboutsummaryrefslogtreecommitdiffstats
path: root/heat/ONAP/cloud-config
diff options
context:
space:
mode:
authormrichomme <morgan.richomme@orange.com>2019-04-25 18:24:19 +0200
committermrichomme <morgan.richomme@orange.com>2019-04-25 18:24:19 +0200
commite3dd7c24232b7060500fee8805416551fe98c92e (patch)
tree880f9df52eff2c00855bf05cfa7ed466379eb36e /heat/ONAP/cloud-config
parent201fa9289e32676b40d1095766e38c74e1653e75 (diff)
Clean old ONAP heat template from demo repository
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>
Diffstat (limited to 'heat/ONAP/cloud-config')
-rw-r--r--heat/ONAP/cloud-config/.env17
-rw-r--r--heat/ONAP/cloud-config/aaf_install.sh34
-rw-r--r--heat/ONAP/cloud-config/aaf_vm_init.sh55
-rw-r--r--heat/ONAP/cloud-config/aai_install.sh33
-rw-r--r--heat/ONAP/cloud-config/aai_vm_init.sh16
-rw-r--r--heat/ONAP/cloud-config/appc_install.sh18
-rw-r--r--heat/ONAP/cloud-config/appc_vm_init.sh33
-rw-r--r--heat/ONAP/cloud-config/clamp_install.sh18
-rw-r--r--heat/ONAP/cloud-config/clamp_vm_init.sh37
-rw-r--r--heat/ONAP/cloud-config/cli_install.sh68
-rw-r--r--heat/ONAP/cloud-config/dbcl_vm_init.sh87
-rw-r--r--heat/ONAP/cloud-config/dcae2_install.sh67
-rw-r--r--heat/ONAP/cloud-config/dns_install.sh89
-rw-r--r--heat/ONAP/cloud-config/docker-compose.yml41
-rw-r--r--heat/ONAP/cloud-config/mr_install.sh18
-rw-r--r--heat/ONAP/cloud-config/mr_vm_init.sh16
-rw-r--r--heat/ONAP/cloud-config/multiserv_install.sh39
-rw-r--r--heat/ONAP/cloud-config/music_install.sh18
-rw-r--r--heat/ONAP/cloud-config/music_vm_init.sh24
-rw-r--r--heat/ONAP/cloud-config/nbi_install.sh17
-rw-r--r--heat/ONAP/cloud-config/nbi_vm_init.sh32
-rw-r--r--heat/ONAP/cloud-config/oof_install.sh18
-rw-r--r--heat/ONAP/cloud-config/oof_vm_init.sh283
-rw-r--r--heat/ONAP/cloud-config/policy_install.sh18
-rw-r--r--heat/ONAP/cloud-config/policy_vm_init.sh78
-rw-r--r--heat/ONAP/cloud-config/portal_install.sh18
-rw-r--r--heat/ONAP/cloud-config/portal_vm_init.sh57
-rw-r--r--heat/ONAP/cloud-config/robot_install.sh31
-rw-r--r--heat/ONAP/cloud-config/robot_vm_init.sh19
-rw-r--r--heat/ONAP/cloud-config/sdc_install.sh66
-rw-r--r--heat/ONAP/cloud-config/sdc_vm_init.sh30
-rw-r--r--heat/ONAP/cloud-config/sdnc_install.sh18
-rw-r--r--heat/ONAP/cloud-config/sdnc_vm_init.sh52
-rw-r--r--heat/ONAP/cloud-config/serv.sh106
-rw-r--r--heat/ONAP/cloud-config/sms_install.sh18
-rw-r--r--heat/ONAP/cloud-config/sms_vm_init.sh23
-rw-r--r--heat/ONAP/cloud-config/so_install.sh22
-rw-r--r--heat/ONAP/cloud-config/so_vm_init.sh105
-rw-r--r--heat/ONAP/cloud-config/vid_install.sh18
-rw-r--r--heat/ONAP/cloud-config/vid_vm_init.sh21
40 files changed, 0 insertions, 1778 deletions
diff --git a/heat/ONAP/cloud-config/.env b/heat/ONAP/cloud-config/.env
deleted file mode 100644
index cbf25f8d..00000000
--- a/heat/ONAP/cloud-config/.env
+++ /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
index 90bc6f63..00000000
--- a/heat/ONAP/cloud-config/aaf_install.sh
+++ /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
index 6d4fa28f..00000000
--- a/heat/ONAP/cloud-config/aaf_vm_init.sh
+++ /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
index 774b45a8..00000000
--- a/heat/ONAP/cloud-config/aai_install.sh
+++ /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
index ffe0955f..00000000
--- a/heat/ONAP/cloud-config/aai_vm_init.sh
+++ /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
index 8c680ee8..00000000
--- a/heat/ONAP/cloud-config/appc_install.sh
+++ /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
index 8c14398b..00000000
--- a/heat/ONAP/cloud-config/appc_vm_init.sh
+++ /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
index 653be903..00000000
--- a/heat/ONAP/cloud-config/clamp_install.sh
+++ /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
index 3b730516..00000000
--- a/heat/ONAP/cloud-config/clamp_vm_init.sh
+++ /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
index 4593c686..00000000
--- a/heat/ONAP/cloud-config/cli_install.sh
+++ /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
index 08cc3f10..00000000
--- a/heat/ONAP/cloud-config/dbcl_vm_init.sh
+++ /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
index f7866fda..00000000
--- a/heat/ONAP/cloud-config/dcae2_install.sh
+++ /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
index ca6f5608..00000000
--- a/heat/ONAP/cloud-config/dns_install.sh
+++ /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
index 4aedf61a..00000000
--- a/heat/ONAP/cloud-config/docker-compose.yml
+++ /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
index be49b972..00000000
--- a/heat/ONAP/cloud-config/mr_install.sh
+++ /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
index 78d61f8a..00000000
--- a/heat/ONAP/cloud-config/mr_vm_init.sh
+++ /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
index 04871725..00000000
--- a/heat/ONAP/cloud-config/multiserv_install.sh
+++ /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
index 42cc01a3..00000000
--- a/heat/ONAP/cloud-config/music_install.sh
+++ /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
index 2241ed13..00000000
--- a/heat/ONAP/cloud-config/music_vm_init.sh
+++ /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
index d7fce0fc..00000000
--- a/heat/ONAP/cloud-config/nbi_install.sh
+++ /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
index a2856347..00000000
--- a/heat/ONAP/cloud-config/nbi_vm_init.sh
+++ /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
index c86aad86..00000000
--- a/heat/ONAP/cloud-config/oof_install.sh
+++ /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
index 47a34e8a..00000000
--- a/heat/ONAP/cloud-config/oof_vm_init.sh
+++ /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
index 362b5827..00000000
--- a/heat/ONAP/cloud-config/policy_install.sh
+++ /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
index 12818402..00000000
--- a/heat/ONAP/cloud-config/policy_vm_init.sh
+++ /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
index 3bd9eeb1..00000000
--- a/heat/ONAP/cloud-config/portal_install.sh
+++ /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
index 17640058..00000000
--- a/heat/ONAP/cloud-config/portal_vm_init.sh
+++ /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
index 90e72513..00000000
--- a/heat/ONAP/cloud-config/robot_install.sh
+++ /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
index 65eec434..00000000
--- a/heat/ONAP/cloud-config/robot_vm_init.sh
+++ /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
index bf6b5929..00000000
--- a/heat/ONAP/cloud-config/sdc_install.sh
+++ /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
index 218806bc..00000000
--- a/heat/ONAP/cloud-config/sdc_vm_init.sh
+++ /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
index 1ab8987f..00000000
--- a/heat/ONAP/cloud-config/sdnc_install.sh
+++ /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
index 7816eab4..00000000
--- a/heat/ONAP/cloud-config/sdnc_vm_init.sh
+++ /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
index 62466d9c..00000000
--- a/heat/ONAP/cloud-config/serv.sh
+++ /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
index 2dd83207..00000000
--- a/heat/ONAP/cloud-config/sms_install.sh
+++ /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
index 62a9ac82..00000000
--- a/heat/ONAP/cloud-config/sms_vm_init.sh
+++ /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
index 36c7c8cb..00000000
--- a/heat/ONAP/cloud-config/so_install.sh
+++ /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
index 1acf2eb0..00000000
--- a/heat/ONAP/cloud-config/so_vm_init.sh
+++ /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
index 23dbce73..00000000
--- a/heat/ONAP/cloud-config/vid_install.sh
+++ /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
index c7f2b6f9..00000000
--- a/heat/ONAP/cloud-config/vid_vm_init.sh
+++ /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