Merge "Add DCAE docker version refs"

diff --combined heat/ONAP/onap_openstack.env
index 00bdeee,b88ff91..db18ee2
--- 1/heat/ONAP/onap_openstack.env
--- 2/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@@ -133,13 -133,11 +133,12 @@@ parameters
    clamp_branch: master
    vnfsdk_branch: master
    music_branch: master
 +  nbi_branch: master
  
    aai_docker: 1.2-STAGING-latest
    aai_sparky_docker: 1.2-STAGING-latest
    appc_docker: 1.3.0-SNAPSHOT-latest
    so_docker: 1.2.1
-   dcae_docker: v1.1.1
    policy_docker: 1.2-STAGING-latest
    portal_docker: 2.1-STAGING-latest
    robot_docker: 1.2-STAGING-latest
@@@ -159,6 -157,25 +158,25 @@@
    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
@@@ -205,4 -222,3 +223,4 @@@
    clamp_repo: http://gerrit.onap.org/r/clamp.git
    vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git
    music_repo: http://gerrit.onap.org/r/music.git
 +  nbi_repo: http://gerrit.onap.org/r/externalapi/nbi.git

diff --combined heat/ONAP/onap_openstack.yaml
index eba6d0d,532ddea..b40f6fb
--- 1/heat/ONAP/onap_openstack.yaml
--- 2/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@@ -296,8 -296,6 +296,8 @@@ parameters
      type: string
    music_repo:
      type: string
 +  nbi_repo:
 +    type: string
  
    ################################
    #                              #
@@@ -313,8 -311,79 +313,79 @@@
      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:
@@@ -420,8 -489,7 +491,8 @@@
      type: string
    music_branch:
      type: string
 -
 +  nbi_branch:
 +    type: string
  
  #############
  #           #
@@@ -1697,7 -1765,7 +1768,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 }
@@@ -1773,6 -1841,26 +1844,26 @@@
              __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
@@@ -1841,6 -1929,25 +1932,25 @@@
              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
@@@ -2080,8 -2187,6 +2190,8 @@@
              __artifacts_version__: { get_param: artifacts_version }
              __dns_ip_addr__: { get_param: dns_ip_addr }
              __docker_version__: { get_param: nbi_docker }
 +            __nbi_repo__: { get_param: nbi_repo }
 +            __gerrit_branch__: { get_param: nbi_branch }
              __cloud_env__: { get_param: cloud_env }
              __external_dns__: { get_param: external_dns }
            template: |
@@@ -2096,8 -2201,6 +2206,8 @@@
              echo "__artifacts_version__" > /opt/config/artifacts_version.txt
              echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
              echo "__docker_version__" > /opt/config/docker_version.txt
 +            echo "__nbi_repo__" > /opt/config/remote_repo.txt
 +            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
              echo "__cloud_env__" > /opt/config/cloud_env.txt
              echo "__external_dns__" > /opt/config/external_dns.txt