aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--boot/bind_zones2
-rw-r--r--boot/bind_zones_onap2
-rw-r--r--boot/dns_install.sh2
-rw-r--r--boot/sdc_vm_init.sh2
-rwxr-xr-xboot/vfc_vm_init.sh62
-rw-r--r--heat/ONAP/deprecated/onap_rackspace.env (renamed from heat/ONAP/onap_rackspace.env)0
-rw-r--r--heat/ONAP/deprecated/onap_rackspace.yaml (renamed from heat/ONAP/onap_rackspace.yaml)0
-rw-r--r--heat/ONAP/onap_openstack.env66
-rw-r--r--heat/ONAP/onap_openstack.yaml274
9 files changed, 125 insertions, 285 deletions
diff --git a/boot/bind_zones b/boot/bind_zones
index 3823aa66..870def1d 100644
--- a/boot/bind_zones
+++ b/boot/bind_zones
@@ -120,8 +120,6 @@ portal.api.simpledemo.openecomp.org. IN CNAME vm1.portal.simpledemo.openecomp.or
;Message Router
;mr.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org.
ueb.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org.
-mr.api.simpledemo.openecomp.org. IN A dcae_coll_ip_addr
-collector.api.simpledemo.openecomp.org. IN A dcae_coll_ip_addr
;dbc.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org.
;drprov.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org.
diff --git a/boot/bind_zones_onap b/boot/bind_zones_onap
index 29891646..365e3a3a 100644
--- a/boot/bind_zones_onap
+++ b/boot/bind_zones_onap
@@ -120,8 +120,6 @@ portal.api.simpledemo.onap.org. IN CNAME vm1.portal.simpledemo.onap.org.
;Message Router
;mr.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org.
ueb.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org.
-mr.api.simpledemo.onap.org. IN A dcae_coll_ip_addr
-collector.api.simpledemo.onap.org. IN A dcae_coll_ip_addr
;dbc.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org.
;drprov.api.simpledemo.onap.org. IN CNAME vm1.mr.simpledemo.onap.org.
diff --git a/boot/dns_install.sh b/boot/dns_install.sh
index 5d3a9a3f..79272cbd 100644
--- a/boot/dns_install.sh
+++ b/boot/dns_install.sh
@@ -86,7 +86,6 @@ then
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/dcae_coll_ip_addr/"$(cat /opt/config/dcae_coll_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
sed -i "s/clamp_ip_addr/"$(cat /opt/config/clamp_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
sed -i "s/openo_ip_addr/"$(cat /opt/config/openo_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
@@ -103,7 +102,6 @@ then
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/dcae_coll_ip_addr/"$(cat /opt/config/dcae_coll_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/openo_ip_addr/"$(cat /opt/config/openo_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
fi
diff --git a/boot/sdc_vm_init.sh b/boot/sdc_vm_init.sh
index dd15c0a1..42be1ffa 100644
--- a/boot/sdc_vm_init.sh
+++ b/boot/sdc_vm_init.sh
@@ -31,4 +31,4 @@ sed -i "s/\"ueb_url_list\":.*/\"ueb_url_list\": \""$MR_IP_ADDR","$MR_IP_ADDR"\",
sed -i "s/\"fqdn\":.*/\"fqdn\": [\""$MR_IP_ADDR"\", \""$MR_IP_ADDR"\"]/g" /data/environments/$ENV_NAME.json
docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-bash /data/scripts/docker_run.sh -e $ENV_NAME -r $RELEASE -p $NEXUS_DOCKER_PORT
+bash /data/scripts/docker_run.sh -r $RELEASE
diff --git a/boot/vfc_vm_init.sh b/boot/vfc_vm_init.sh
index 7d94604c..f2ec40cc 100755
--- a/boot/vfc_vm_init.sh
+++ b/boot/vfc_vm_init.sh
@@ -4,27 +4,27 @@
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/vfc_docker.txt)
source /opt/config/onap_ips.txt
+source /opt/config/vfc_docker.txt
# Refresh images
docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/wfengine-activiti:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/wfengine-mgrservice:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/catalog:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/emsdriver:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/gvnfmdriver:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/jujudriver:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/huawei:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/nslcm:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/resmanagement:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnflcm:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztevmanagerdriver:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$DOCKER_IMAGE_VERSION
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/wfengine-activiti:$ACTIVITI_DOCKER_VER
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/wfengine-mgrservice:$MGRSERVICE_DOCKER_VER
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/catalog:$CATALOG_DOCKER_VER
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/emsdriver:$EMSDRIVER_DOCKER_VER
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/gvnfmdriver:$GVNFMDRIVER_DOCKER_VER
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/jujudriver:$JUJUDRIVER_DOCKER_VER
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/huawei:$HUAWEI_DOCKER_VER
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/nslcm:$NSLCM_DOCKER_VER
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/resmanagement:$RESMANAGEMENT_DOCKER_VER
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnflcm:$VNFLCM_DOCKER_VER
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$VNFMGR_DOCKER_VER
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$VNFRES_DOCKER_VER
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$ZTESDNCDRIVER_DOCKER_VER
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/ztevmanagerdriver:$ZTEVMANAGERDRIVER_DOCKER_VER
+docker pull $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$NOKIA_DOCKER_VER
docker rm -f vfc_wfengine_mgrservice
docker rm -f vfc_wfengine_activiti
@@ -43,18 +43,18 @@ docker rm -f vfc_ztevmanagerdriver
docker rm -f vfc_svnfm_nokia
# Insert docker run instructions here
-docker run -i -t -d --name vfc_wfengine_activiti -p 8804:8080 -e SERVICE_IP=$OPENO_IP -e SERVICE_PORT=8804 -e OPENPALETTE_MSB_IP=$OPENO_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-activiti:$DOCKER_IMAGE_VERSION
-docker run -i -t -d --name vfc_wfengine_mgrservice -p 8805:10550 -e SERVICE_IP=$OPENO_IP -e SERVICE_PORT=8805 -e OPENPALETTE_MSB_IP=$OPENO_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-mgrservice:$DOCKER_IMAGE_VERSION
-docker run -i -t -d --name vfc_catalog -p 8806:8806 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/catalog:$DOCKER_IMAGE_VERSION
-docker run -i -t -d --name vfc_emsdriver -p 8206:8206 -e MSB_ADDR=$OPENO_IP:80 -e VES_ADDR=$DCAE_COLL_IP:8080 -e VES_AUTHINFO="":"" $NEXUS_DOCKER_REPO/onap/vfc/emsdriver:$DOCKER_IMAGE_VERSION
-docker run -i -t -d --name vfc_gvnfmdriver -p 8484:8484 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/gvnfmdriver:$DOCKER_IMAGE_VERSION
-docker run -i -t -d --name vfc_jujudriver -p 8483:8483 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/jujudriver:$DOCKER_IMAGE_VERSION
-docker run -i -t -d --name vfc_svnfm_huawei -p 8482:8482 -p 8443:8443 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/huawei:$DOCKER_IMAGE_VERSION
-docker run -i -t -d --name vfc_nslcm -p 8403:8403 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/nslcm:$DOCKER_IMAGE_VERSION
-docker run -i -t -d --name vfc_resmanagement -p 8480:8480 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/resmanagement:$DOCKER_IMAGE_VERSION
-docker run -i -t -d --name vfc_vnflcm -p 8801:8801 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/vnflcm:$DOCKER_IMAGE_VERSION
-docker run -i -t -d --name vfc_vnfmgr -p 8803:8803 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$DOCKER_IMAGE_VERSION
-docker run -i -t -d --name vfc_vnfres -p 8802:8802 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$DOCKER_IMAGE_VERSION
-docker run -i -t -d --name vfc_ztesdncdriver -p 8411:8411 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$DOCKER_IMAGE_VERSION
-docker run -i -t -d --name vfc_ztevmanagerdriver -p 8410:8410 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/ztevmanagerdriver:$DOCKER_IMAGE_VERSION
-docker run -i -t -d --name vfc_svnfm_nokia -p 8486:8486 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$DOCKER_IMAGE_VERSION
+docker run -i -t -d --name vfc_wfengine_activiti -p 8804:8080 -e SERVICE_IP=$OPENO_IP -e SERVICE_PORT=8804 -e OPENPALETTE_MSB_IP=$OPENO_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-activiti:$ACTIVITI_DOCKER_VER
+docker run -i -t -d --name vfc_wfengine_mgrservice -p 8805:10550 -e SERVICE_IP=$OPENO_IP -e SERVICE_PORT=8805 -e OPENPALETTE_MSB_IP=$OPENO_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-mgrservice:$MGRSERVICE_DOCKER_VER
+docker run -i -t -d --name vfc_catalog -p 8806:8806 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/catalog:$CATALOG_DOCKER_VER
+docker run -i -t -d --name vfc_emsdriver -p 8206:8206 -e MSB_ADDR=$OPENO_IP:80 -e VES_ADDR=$DCAE_COLL_IP:8080 -e VES_AUTHINFO="":"" $NEXUS_DOCKER_REPO/onap/vfc/emsdriver:$EMSDRIVER_DOCKER_VER
+docker run -i -t -d --name vfc_gvnfmdriver -p 8484:8484 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/gvnfmdriver:$GVNFMDRIVER_DOCKER_VER
+docker run -i -t -d --name vfc_jujudriver -p 8483:8483 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/jujudriver:$JUJUDRIVER_DOCKER_VER
+docker run -i -t -d --name vfc_svnfm_huawei -p 8482:8482 -p 8443:8443 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/huawei:$HUAWEI_DOCKER_VER
+docker run -i -t -d --name vfc_nslcm -p 8403:8403 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/nslcm:$NSLCM_DOCKER_VER
+docker run -i -t -d --name vfc_resmanagement -p 8480:8480 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/resmanagement:$RESMANAGEMENT_DOCKER_VER
+docker run -i -t -d --name vfc_vnflcm -p 8801:8801 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/vnflcm:$VNFLCM_DOCKER_VER
+docker run -i -t -d --name vfc_vnfmgr -p 8803:8803 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$VNFMGR_DOCKER_VER
+docker run -i -t -d --name vfc_vnfres -p 8802:8802 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$VNFRES_DOCKER_VER
+docker run -i -t -d --name vfc_ztesdncdriver -p 8411:8411 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$ZTESDNCDRIVER_DOCKER_VER
+docker run -i -t -d --name vfc_ztevmanagerdriver -p 8410:8410 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/ztevmanagerdriver:$ZTEVMANAGERDRIVER_DOCKER_VER
+docker run -i -t -d --name vfc_svnfm_nokia -p 8486:8486 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$NOKIA_DOCKER_VER
diff --git a/heat/ONAP/onap_rackspace.env b/heat/ONAP/deprecated/onap_rackspace.env
index d08c24e8..d08c24e8 100644
--- a/heat/ONAP/onap_rackspace.env
+++ b/heat/ONAP/deprecated/onap_rackspace.env
diff --git a/heat/ONAP/onap_rackspace.yaml b/heat/ONAP/deprecated/onap_rackspace.yaml
index a73053f2..a73053f2 100644
--- a/heat/ONAP/onap_rackspace.yaml
+++ b/heat/ONAP/deprecated/onap_rackspace.yaml
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 3a64fca7..00f28366 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -78,11 +78,6 @@ parameters:
aai2_ip_addr: 10.0.1.2
appc_ip_addr: 10.0.2.1
dcae_ip_addr: 10.0.4.1
- dcae_coll_ip_addr: 10.0.4.102
- dcae_db_ip_addr: 10.0.4.101
- dcae_hdp1_ip_addr: 10.0.4.103
- dcae_hdp2_ip_addr: 10.0.4.104
- dcae_hdp3_ip_addr: 10.0.4.105
dns_ip_addr: 10.0.100.1
so_ip_addr: 10.0.5.1
mr_ip_addr: 10.0.11.1
@@ -95,32 +90,12 @@ parameters:
clamp_ip_addr: 10.0.12.1
openo_ip_addr: 10.0.14.1
-# dcae_coll_float_ip: PUT DCAE COLLECTOR FLOATING IP HERE
-# dcae_db_float_ip: PUT DCAE DATABASE FLOATING IP HERE
-# dcae_hdp1_float_ip: PUT DCAE HADOOP VM1 FLOATING IP HERE
-# dcae_hdp2_float_ip: PUT DCAE HADOOP VM2 FLOATING IP HERE
-# dcae_hdp3_float_ip: PUT DCAE HADOOP VM3 FLOATING IP HERE
-
###########################
# #
# Parameters used by DCAE #
# #
###########################
-# dcae_base_environment: 1-NIC-FLOATING-IPS
-
-# dcae_zone: ZONE
-
-# dcae_state: STATE
-
-# nexus_repo_root: https://nexus.onap.org
-
-# nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots
-
-# gitlab_branch: master
-
-# dcae_code_version: 1.1.0
-
dnsaas_config_enabled: PUT WHETHER TO USE PROXYED DESIGNATE
dnsaas_region: PUT THE DESIGNATE PROVIDING OPENSTACK'S REGION HERE
dnsaas_keystone_url: PUT THE DESIGNATE PROVIDING OPENSTACK'S KEYSTONE URL HERE
@@ -143,36 +118,50 @@ parameters:
appc_branch: master
so_branch: master
mr_branch: master
- dcae_branch: master
policy_branch: master
portal_branch: release-1.3.0
robot_branch: master
- sdc_branch: master
- sdnc_branch: master
+ sdc_branch: release-1.1.0
+ sdnc_branch: release-1.1.0
vid_branch: master
clamp_branch: master
vnfsdk_branch: master
- aai_docker: 1.1-STAGING-latest
+ aai_docker: v1.1.0
+ aai_sparky_docker: v1.0.0
appc_docker: 1.1-STAGING-latest
- so_docker: 1.1-STAGING-latest
- mr_docker: 1.1-STAGING-latest
+ so_docker: v1.1.0
dcae_docker: 1.1-latest
- policy_docker: 1.1-STAGING-latest
+ policy_docker: v1.1.0
portal_docker: v1.3.0
robot_docker: 1.1-STAGING-latest
- sdc_docker: 1.1-STAGING-latest
+ sdc_docker: v1.0.0
sdnc_docker: 1.2-STAGING-latest
- vid_docker: 1.1-STAGING-latest
- clamp_docker: 1.1-STAGING-latest
- msb_docker: latest
+ vid_docker: v1.1.0
+ clamp_docker: v1.1.0
+ msb_docker: v1.0.0
mvim_docker: latest
- vfc_docker: latest
uui_docker: latest
- esr_docker: latest
+ esr_docker: v1.0.0
dgbuilder_docker: 0.1-STAGING-latest
cli_docker: v1.1.0
+ vfc_nokia_docker: v1.0.0
+ vfc_ztevmanagerdriver_docker: v1.0.1
+ vfc_ztesdncdriver_docker: v1.0.1
+ vfc_vnfres_docker: v1.0.1
+ vfc_vnfmgr_docker: v1.0.1
+ vfc_vnflcm_docker: v1.0.1
+ vfc_resmanagement_docker: v1.0.0
+ vfc_nslcm_docker: v1.0.1
+ vfc_huawei_docker: v1.0.0
+ vfc_jujudriver_docker: v1.0.0
+ vfc_gvnfmdriver_docker: v1.0.1
+ vfc_emsdriver_docker: v1.0.1
+ vfc_catalog_docker: v1.0.1
+ vfc_wfengine_mgrservice_docker: v1.0.0
+ vfc_wfengine_activiti_docker: v1.0.0
+
#####################
# #
# ONAP repositories #
@@ -180,7 +169,6 @@ parameters:
#####################
aai_repo: http://gerrit.onap.org/r/aai/test-config
appc_repo: http://gerrit.onap.org/r/appc/deployment.git
- dcae_repo: http://gerrit.onap.org/r/dcae/demo/startup/controller.git
mr_repo: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git
so_repo: http://gerrit.onap.org/r/so/docker-config.git
policy_repo: http://gerrit.onap.org/r/policy/docker.git
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 3ba7ffe4..3201e7b9 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -160,7 +160,7 @@ parameters:
external_dns:
type: string
- description: First element of the dns_list for ONAP network
+ description: Public IP of the external DNS for ONAP network
dns_forwarder:
type: string
@@ -179,16 +179,6 @@ parameters:
type: string
dcae_ip_addr:
type: string
- dcae_coll_ip_addr:
- type: string
- dcae_db_ip_addr:
- type: string
- dcae_hdp1_ip_addr:
- type: string
- dcae_hdp2_ip_addr:
- type: string
- dcae_hdp3_ip_addr:
- type: string
dns_ip_addr:
type: string
so_ip_addr:
@@ -211,16 +201,6 @@ parameters:
type: string
openo_ip_addr:
type: string
-# dcae_coll_float_ip:
-# type: string
-# dcae_db_float_ip:
-# type: string
-# dcae_hdp1_float_ip:
-# type: string
-# dcae_hdp2_float_ip:
-# type: string
-# dcae_hdp3_float_ip:
-# type: string
###########################
# #
@@ -272,34 +252,6 @@ parameters:
type: string
description: the top level domain to register DCAE VMs (the zone will be random-str.dcae_domain)
-# dcae_base_environment:
-# type: string
-# description: DCAE Base Environment configuration (RACKSPACE/2-NIC/1-NIC-FLOATING-IPS)
-
-# dcae_zone:
-# type: string
-# description: DCAE Zone to use in VM names created by DCAE controller
-
-# dcae_state:
-# type: string
-# description: DCAE State to use in VM names created by DCAE controller
-
-# nexus_repo_root:
-# type: string
-# description: Root URL of Nexus repository
-
-# nexus_url_snapshot:
-# type: string
-# description: Snapshot of Maven repository for DCAE deployment
-
-# gitlab_branch:
-# type: string
-# description: Branch of the Gitlab repository
-
-# dcae_code_version:
-# type: string
-# description: DCAE Code Version Number
-
#####################
# #
# ONAP repositories #
@@ -310,8 +262,6 @@ parameters:
type: string
appc_repo:
type: string
- dcae_repo:
- type: string
mr_repo:
type: string
so_repo:
@@ -341,12 +291,12 @@ parameters:
aai_docker:
type: string
+ aai_sparky_docker:
+ type: string
appc_docker:
type: string
so_docker:
type: string
- mr_docker:
- type: string
dcae_docker:
type: string
policy_docker:
@@ -367,8 +317,6 @@ parameters:
type: string
mvim_docker:
type: string
- vfc_docker:
- type: string
uui_docker:
type: string
esr_docker:
@@ -377,6 +325,36 @@ parameters:
type: string
cli_docker:
type: string
+ vfc_nokia_docker:
+ type: string
+ vfc_ztevmanagerdriver_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
aai_branch:
type: string
@@ -386,8 +364,6 @@ parameters:
type: string
mr_branch:
type: string
- dcae_branch:
- type: string
policy_branch:
type: string
portal_branch:
@@ -534,7 +510,6 @@ resources:
__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_coll_ip_addr__: { get_param: dcae_coll_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 }
@@ -562,7 +537,6 @@ resources:
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_coll_ip_addr__" > /opt/config/dcae_coll_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
@@ -622,6 +596,7 @@ resources:
__artifacts_version__: { get_param: artifacts_version }
__dns_ip_addr__: { get_param: dns_ip_addr }
__docker_version__: { get_param: aai_docker }
+ __aai_sparky_docker__ : { get_param: aai_sparky_docker }
__gerrit_branch__: { get_param: aai_branch }
__cloud_env__: { get_param: cloud_env }
__external_dns__: { get_param: external_dns }
@@ -639,6 +614,7 @@ resources:
echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
echo "__docker_version__" > /opt/config/docker_version.txt
+ echo "__aai_sparky_docker__" > /opt/config/sparky_version.txt
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
echo "aai_instance_1" > /opt/config/aai_instance.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
@@ -902,7 +878,6 @@ resources:
__artifacts_version__: { get_param: artifacts_version }
__openstack_region__: { get_param: openstack_region }
__dns_ip_addr__: { get_param: dns_ip_addr }
- __docker_version__: { get_param: mr_docker }
__gerrit_branch__: { get_param: mr_branch }
__cloud_env__: { get_param: cloud_env }
__keystone_url__: { get_param: keystone_url }
@@ -1253,147 +1228,6 @@ resources:
./portal_install.sh
- # DCAE Controller instantiation
-# dcae_c_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 }}]
-
-# dcae_c_floating_ip:
-# type: OS::Neutron::FloatingIP
-# properties:
-# floating_network_id: { get_param: public_net_id }
-# port_id: { get_resource: dcae_c_private_port }
-
-# dcae_c_vm:
-# type: OS::Nova::Server
-# properties:
-# image: { get_param: ubuntu_1404_image }
-# flavor: { get_param: flavor_medium }
-# name:
-# str_replace:
-# template: base-dcae-controller
-# params:
-# base: { get_param: vm_base_name }
-# key_name: { get_resource: vm_key }
-# networks:
-# - port: { get_resource: dcae_c_private_port }
-# user_data_format: RAW
-# user_data:
-# str_replace:
-# params:
-# __nexus_repo__: { get_param: nexus_repo }
-# __nexus_docker_repo__: { get_param: nexus_docker_repo }
-# __nexus_username__: { get_param: nexus_username }
-# __nexus_password__: { get_param: nexus_password }
-# __nexus_url_snapshots__: { get_param: nexus_url_snapshot }
-# __gitlab_branch__: { get_param: gitlab_branch }
-# __dns_ip_addr__: { get_param: dns_ip_addr }
-# __dcae_zone__: { get_param: dcae_zone }
-# __dcae_state__: { get_param: dcae_state }
-# __artifacts_version__: { get_param: artifacts_version }
-# __tenant_id__: { get_param: openstack_tenant_id }
-# __openstack_private_network_name__: { get_attr: [oam_onap, name] }
-# __openstack_user__: { get_param: openstack_username }
-# __openstack_password__: { get_param: openstack_api_key }
-# __openstack_auth_method__: { get_param: openstack_auth_method }
-# __key_name__: { get_param: key_name }
-# __rand_str__: { get_resource: random-str }
-# __pub_key__: { get_param: pub_key }
-# __nexus_repo_root__: { get_param: nexus_repo_root }
-# __openstack_region__: { get_param: openstack_region }
-# __horizon_url__: { get_param: horizon_url }
-# __keystone_url__: { get_param: keystone_url }
-# __docker_version__: { get_param: dcae_docker }
-# __gerrit_branch__: { get_param: dcae_branch }
-# __dcae_code_version__: { get_param: dcae_code_version }
-# __cloud_env__: { get_param: cloud_env }
-# __public_net_id__: { get_param: public_net_id }
-# __dcae_base_environment__: { get_param: dcae_base_environment }
-# __dcae_ip_addr__: { get_param: dcae_ip_addr }
-# __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr }
-# __dcae_db_ip_addr__: { get_param: dcae_db_ip_addr }
-# __dcae_hdp1_ip_addr__: { get_param: dcae_hdp1_ip_addr }
-# __dcae_hdp2_ip_addr__: { get_param: dcae_hdp2_ip_addr }
-# __dcae_hdp3_ip_addr__: { get_param: dcae_hdp3_ip_addr }
-# __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
-# __dcae_coll_float_ip__: { get_param: dcae_coll_float_ip }
-# __dcae_db_float_ip__: { get_param: dcae_db_float_ip }
-# __dcae_hdp1_float_ip__: { get_param: dcae_hdp1_float_ip }
-# __dcae_hdp2_float_ip__: { get_param: dcae_hdp2_float_ip }
-# __dcae_hdp3_float_ip__: { get_param: dcae_hdp3_float_ip }
-# __external_dns__: { get_param: external_dns }
-# __ubuntu_1404_image__: { get_param: ubuntu_1404_image }
-# __ubuntu_1604_image__: { get_param: ubuntu_1604_image }
-# __flavor_small__: { get_param: flavor_small }
-# __flavor_medium__: { get_param: flavor_medium }
-# __flavor_large__: { get_param: flavor_large }
-# __flavor_xlarge__: { get_param: flavor_xlarge }
-# __dcae_repo__: { get_param: dcae_repo }
-# __mr_repo__: { get_param: mr_repo }
-# template: |
- #!/bin/bash
-
- # Create configuration files
-# mkdir -p /opt/config
-# echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-# echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-# echo "__nexus_username__" > /opt/config/nexus_username.txt
-# echo "__nexus_password__" > /opt/config/nexus_password.txt
-# echo "__nexus_url_snapshots__" > /opt/config/nexus_url_snapshots.txt
-# echo "__gitlab_branch__" > /opt/config/gitlab_branch.txt
-# echo "__docker_version__" > /opt/config/docker_version.txt
-# echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-# echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-# echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-# echo "__dcae_zone__" > /opt/config/dcae_zone.txt
-# echo "__dcae_state__" > /opt/config/dcae_state.txt
-# echo "__tenant_id__" > /opt/config/tenant_id.txt
-# echo "__openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt
-# echo "__openstack_user__" > /opt/config/openstack_user.txt
-# echo "__openstack_password__" > /opt/config/openstack_password.txt
-# echo "__openstack_auth_method__" > /opt/config/openstack_auth_method.txt
-# echo "__key_name__" > /opt/config/key_name.txt
-# echo "__rand_str__" > /opt/config/rand_str.txt
-# echo "__pub_key__" > /opt/config/pub_key.txt
-# echo "__nexus_repo_root__" > /opt/config/nexus_repo_root.txt
-# echo "__openstack_region__" > /opt/config/openstack_region.txt
-# echo "__horizon_url__" > /opt/config/horizon_url.txt
-# echo "__keystone_url__" > /opt/config/keystone_url.txt
-# echo "__cloud_env__" > /opt/config/cloud_env.txt
-# echo "__public_net_id__" > /opt/config/public_net_id.txt
-# echo "__dcae_base_environment__" > /opt/config/dcae_base_environment.txt
-# echo "__dcae_code_version__" > /opt/config/dcae_code_version.txt
-# echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
-# echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt
-# echo "__dcae_db_ip_addr__" > /opt/config/dcae_db_ip_addr.txt
-# echo "__dcae_hdp1_ip_addr__" > /opt/config/dcae_hdp1_ip_addr.txt
-# echo "__dcae_hdp2_ip_addr__" > /opt/config/dcae_hdp2_ip_addr.txt
-# echo "__dcae_hdp3_ip_addr__" > /opt/config/dcae_hdp3_ip_addr.txt
-# echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt
-# echo "__dcae_coll_float_ip__" > /opt/config/dcae_coll_float_ip.txt
-# echo "__dcae_db_float_ip__" > /opt/config/dcae_db_float_ip.txt
-# echo "__dcae_hdp1_float_ip__" > /opt/config/dcae_hdp1_float_ip.txt
-# echo "__dcae_hdp2_float_ip__" > /opt/config/dcae_hdp2_float_ip.txt
-# echo "__dcae_hdp3_float_ip__" > /opt/config/dcae_hdp3_float_ip.txt
-# echo "__external_dns__" > /opt/config/external_dns.txt
-# echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt
-# echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt
-# echo "__flavor_small__" > /opt/config/flavor_small.txt
-# echo "__flavor_medium__" > /opt/config/flavor_medium.txt
-# echo "__flavor_large__" > /opt/config/flavor_large.txt
-# echo "__flavor_xlarge__" > /opt/config/flavor_xlarge.txt
-# echo "__dcae_repo__" > /opt/config/remote_repo.txt
-# echo "__mr_repo__" > /opt/config/mr_repo.txt
-
- # Download and run install script
-# curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae_install.sh -o /opt/dcae_install.sh
-# cd /opt
-# chmod +x dcae_install.sh
-# ./dcae_install.sh
-
-
# Policy Engine instantiation
policy_private_port:
type: OS::Neutron::Port
@@ -1648,7 +1482,6 @@ resources:
__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_coll_ip_addr__: { get_param: dcae_coll_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 }
@@ -1664,10 +1497,24 @@ resources:
__vnfsdk_branch__: { get_param: vnfsdk_branch }
__msb_docker__: { get_param: msb_docker }
__mvim_docker__: { get_param: mvim_docker }
- __vfc_docker__: { get_param: vfc_docker }
__uui_docker__: { get_param: uui_docker }
__esr_docker__: { get_param: esr_docker }
__vnfsdk_repo__: { get_param: vnfsdk_repo }
+ __vfc_nokia_docker__: { get_param: vfc_nokia_docker }
+ __vfc_ztevmanagerdriver_docker__: { get_param: vfc_ztevmanagerdriver_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
@@ -1685,17 +1532,31 @@ resources:
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 "__vfc_docker__" > /opt/config/vfc_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 NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt
+ echo "export ZTEVMANAGERDRIVER_DOCKER_VER=__vfc_ztevmanagerdriver_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 DCAE_COLL_IP=__dcae_coll_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
@@ -1754,8 +1615,6 @@ resources:
__nexus_docker_repo__: { get_param: nexus_docker_repo }
__nexus_username__: { get_param: nexus_username }
__nexus_password__: { get_param: nexus_password }
- __dcae_repo__: { get_param: dcae_repo }
- __gerrit_branch__: { get_param: dcae_branch }
# conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs
__mac_addr__: { get_attr: [dcae_c_private_port, mac_address] }
__dcae_ip_addr__: { get_param: dcae_ip_addr }
@@ -1826,7 +1685,6 @@ resources:
echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
echo "__nexus_username__" > /opt/config/nexus_username.txt
echo "__nexus_password__" > /opt/config/nexus_password.txt
- echo "__dcae_repo__" > /opt/config/remote_repo.txt
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
# conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs
echo "__mac_addr__" > /opt/config/mac_addr.txt