Add DCAE docker version refs

Issue-ID: DCAEGEN2-206
Change-Id: I4e2fc2bb8b07adf6e7c24c07dc2e5c559ff3cffd
Signed-off-by: Lusheng Ji <lji@research.att.com>

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index ccd67fe..b88ff91 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -138,7 +138,6 @@ parameters:
   aai_sparky_docker: 1.2-STAGING-latest
   appc_docker: 1.3.0-SNAPSHOT-latest
   so_docker: 1.2.1
-  dcae_docker: v1.1.1
   policy_docker: 1.2-STAGING-latest
   portal_docker: 2.1-STAGING-latest
   robot_docker: 1.2-STAGING-latest
@@ -158,6 +157,25 @@ parameters:
   aaf_docker: latest
   nbi_docker: latest
 
+  dcae_docker:  1.1.2
+  dcae_snmptrap_docker:  latest
+  dcae_ves_docker:  latest
+  dcae_bootstrap_docker: 1.1.2
+  dcae_cm_docker: latest
+  dcae_k8sbootstrap_docker: latest
+  dcae_redisc_docker: latest
+  dcae_tca_docker: latest
+  dcae_cb_docker: v4.0.0
+  dcae_cbs_docker: latest
+  dcae_dh_docker: latest
+  dcae_inv_docker: latest
+  dcae_ph_docker: latest
+  dcae_sch_docker: latest
+  dcae_heartbeat_docker: latest
+  dcae_prh_docker: latest
+  holmes_rm_docker: v1.0.0
+  holmes_em_docker: v1.0.0
+
   vfc_nokia_docker: 1.1.0-STAGING-latest
   vfc_nokiav2_docker: 1.1.0-STAGING-latest
   vfc_ztevnfmdriver_docker: 1.1.0-STAGING-latest

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 5ee87b5..532ddea 100644 (file)
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -311,8 +311,79 @@ parameters:
     type: string
   so_docker:
     type: string
+
   dcae_docker:
     type: string
+    default: latest
+  dcae_snmptrap_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.collectors.snmptrap 
+  dcae_ves_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.collectors.ves.vescollector
+  dcae_bootstrap_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.deployments.bootstrap
+  dcae_cm_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.deployments.cm-container
+  dcae_k8sbootstrap_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.deployments.k8s-bootstrap-container
+  dcae_redisc_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.deployments.redis-cluster-container
+  dcae_tca_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.deployments.tca-cdap-container
+  dcae_cb_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.platform.cdapbroker
+  dcae_cbs_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.platform.configbinding
+  dcae_dh_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.platform.deployment-handler
+  dcae_inv_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.platform.inventory-api
+  dcae_ph_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.platform.deployment-handler
+  dcae_sch_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.platform.servicechange-handler
+  dcae_heartbeat_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.services.heartbeat
+  dcae_prh_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.services.prh.prh-app-server  
+  holmes_em_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/holmes/engine-management
+  holmes_rm_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/holmes/rule-management
+
   policy_docker:
     type: string
   portal_docker:
@@ -1694,7 +1765,7 @@ resources:
       flavor: { get_param: flavor_large }
       name:
         str_replace:
-          template: base-dcae-bootstrap
+          template: base-dcae
           params:
             base: { get_param: vm_base_name }
       key_name: { get_resource: vm_key }
@@ -1770,6 +1841,26 @@ resources:
             __policy_floating_ip_addr__: { get_attr: [policy_floating_ip, floating_ip_address] }
             __openo_floating_ip_addr__: { get_attr: [openo_floating_ip, floating_ip_address] }
             __dcae_c_floating_ip_addr__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
+            # container versions
+            __dcae_docker__:  { get_param: dcae_docker }
+            __dcae_snmptrap_docker__:  { get_param: dcae_snmptrap_docker }
+            __dcae_ves_docker__:  { get_param: dcae_ves_docker }
+            __dcae_bootstrap_docker__:  { get_param: dcae_bootstrap_docker }
+            __dcae_cm_docker__:  { get_param: dcae_cm_docker }
+            __dcae_k8sbootstrap_docker__:  { get_param: dcae_k8sbootstrap_docker }
+            __dcae_redisc_docker__:  { get_param: dcae_redisc_docker }
+            __dcae_tca_docker__:  { get_param: dcae_tca_docker }
+            __dcae_cb_docker__:  { get_param: dcae_cb_docker }
+            __dcae_cbs_docker__:  { get_param: dcae_cbs_docker }
+            __dcae_dh_docker__:  { get_param: dcae_dh_docker }
+            __dcae_inv_docker__:  { get_param: dcae_inv_docker }
+            __dcae_ph_docker__:  { get_param: dcae_ph_docker }
+            __dcae_sch_docker__:  { get_param: dcae_sch_docker }
+            __dcae_heartbeat_docker__:  { get_param: dcae_heartbeat_docker }
+            __dcae_prh_docker__:  { get_param: dcaeprh_docker }
+            __holmes_em_docker__:  { get_param: holmes_em_docker }
+            __holmes_rm_docker__:  { get_param: holmes_rm_docker }
+
 
           template: |
             #!/bin/bash
@@ -1838,6 +1929,25 @@ resources:
             echo "__policy_floating_ip_addr__" > /opt/config/policy_floating_ip_addr.txt
             echo "__openo_floating_ip_addr__" > /opt/config/openo_floating_ip_addr.txt
             echo "__dcae_c_floating_ip_addr__" > /opt/config/dcae_c_floating_ip_addr.txt
+            # container versions
+            echo "__dcae_docker__" > /opt/config/dcae_docker.txt
+            echo "__dcae_snmptrap_docker__" > /opt/config/dcae_docker_snmptrap.txt
+            echo "__dcae_ves_docker__" > /opt/config/dcae_docker_ves.txt
+            echo "__dcae_bootstrap_docker__" > /opt/config/dcae_docker_bootstrap.txt
+            echo "__dcae_cm_docker__" > /opt/config/dcae_docker_cm.txt
+            echo "__dcae_k8sbootstrap_docker__" > /opt/config/dcae_docker_k8sbootstrap.txt
+            echo "__dcae_redisc_docker__" > /opt/config/dcae_docker_redisc.txt
+            echo "__dcae_tca_docker__" > /opt/config/dcae_docker_tca.txt
+            echo "__dcae_cb_docker__" > /opt/config/dcae_docker_cb.txt
+            echo "__dcae_cbs_docker__" > /opt/config/dcae_docker_cbs.txt
+            echo "__dcae_dh_docker__" > /opt/config/dcae_docker_dh.txt
+            echo "__dcae_inv_docker__" > /opt/config/dcae_docker_inv.txt
+            echo "__dcae_ph_docker__" > /opt/config/dcae_docker_ph.txt
+            echo "__dcae_sch_docker__" > /opt/config/dcae_docker_sch.txt
+            echo "__dcae_heartbeat_docker__" > /opt/config/dcae_docker_heartbeat.txt
+            echo "__dcae_prh_docker__" > /opt/config/dcae_docker_prh.txt
+            echo "__holmes_em_docker__" > /opt/config/holmes_docker_em.txt
+            echo "__holmes_rm_docker__" > /opt/config/holmes_docker_rm.txt
 
             # Download and run install script
             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae2_install.sh -o /opt/dcae2_install.sh

diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index fbabf09..f3254c2 100644 (file)
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -138,7 +138,6 @@ parameters:
   aai_sparky_docker: ${AAI_RESOURCES_DOCKER}
   appc_docker: ${APPC_IMAGE_DOCKER}
   so_docker: ${MSO_DOCKER}
-  dcae_docker: ${BOOTSTRAP_DOCKER}
   policy_docker: ${POLICY_DB_DOCKER}
   portal_docker: ${PORTAL_APP_DOCKER}
   robot_docker: ${TESTSUITE_DOCKER}
@@ -158,6 +157,25 @@ parameters:
   aaf_docker: ${AAF_DOCKER}
   nbi_docker: ${NBI_DOCKER}
 
+  dcae_docker:  ${BOOTSTRAP_DOCKER}
+  dcae_snmptrap_docker:  ${SNMPTRAP_DOCKER}
+  dcae_ves_docker:  ${VESCOLLECTOR_DOCKER}
+  dcae_bootstrap_docker: ${BOOTSTRAP_DOCKER}
+  dcae_cm_docker: ${CM_CONTAINER_DOCKER}
+  dcae_k8sbootstrap_docker: ${K8S_BOOTSTRAP_CONTAINER_DOCKER}
+  dcae_redisc_docker: ${REDIS_CLUSTER_CONTAINER_DOCKER}
+  dcae_tca_docker: ${TCA_CDAP_CONTAINER_DOCKER}
+  dcae_cb_docker: ${CDAPBROKER_DOCKER}
+  dcae_cbs_docker: ${CONFIGBINDING_DOCKER}
+  dcae_dh_docker: ${DEPLOYMENT_HANDLER_DOCKER}
+  dcae_inv_docker: ${INVENTORY_API_DOCKER}
+  dcae_ph_docker: ${POLICY_HANDLER_DOCKER}
+  dcae_sch_docker: ${SERVICECHANGE_HANDLER_DOCKER}
+  dcae_heartbeat_docker: ${HEARTBEAT_DOCKER}
+  dcae_prh_docker: ${PRH_APP_SERVER_DOCKER}
+  holmes_rm_docker: ${RULE_MANAGEMENT_DOCKER}
+  holmes_em_docker: ${ENGINE_MANAGEMENT_DOCKER}
+
   vfc_nokia_docker: ${NOKIA_DOCKER}
   vfc_nokiav2_docker: ${NOKIAV2_DOCKER}
   vfc_ztevnfmdriver_docker: ${ZTEVNFMDRIVER_DOCKER}