summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2018-09-19 13:19:12 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-19 13:19:12 +0000
commit00d49323b142089345a9bdb2de080263a055ea8f (patch)
tree338a1eba916ffa03f93dff4b7fcfca6f5e3b24d6
parenta63189477d415cdcca1ed97a65e8251754a06af6 (diff)
parent5a57bd2e80cd4ac81ac525a00f304a3261b8c20c (diff)
Merge "Update docker tags for R3"
-rw-r--r--heat/ONAP/onap_openstack.env31
-rw-r--r--heat/ONAP/onap_openstack.yaml106
-rw-r--r--heat/ONAP/onap_openstack_template.env21
3 files changed, 101 insertions, 57 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index db23dd7e..d9040e74 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -152,21 +152,28 @@ parameters:
dbcl_docker: "1.0.12"
dcae_docker: "1.1.3"
- dcae_snmptrap_docker: "1.3.0"
- dcae_ves_docker: "1.2.0"
- dcae_hvves_docker: "latest"
- dcae_datafile_docker: "latest"
dcae_bootstrap_docker: "1.1.3"
- dcae_cm_docker: "1.3.0"
- dcae_k8sbootstrap_docker: "1.1.11"
+ dcae_k8sbootstrap_docker: "1.4.2"
dcae_redisc_docker: "1.0.0"
- dcae_tca_docker: "1.1.0"
+ dcae_hc_docker: "1.1.0"
+ dcae_tls_docker: "1.0.0"
dcae_cb_docker: "4.1.0"
- dcae_cbs_docker: "2.1.5"
- dcae_dh_docker: "2.1.5"
- dcae_inv_docker: "3.0.1"
- dcae_ph_docker: "2.4.5"
- dcae_sch_docker: "1.1.4"
+ dcae_snmptrap_docker: "1.4.0"
+ dcae_ves_docker: "1.3.1"
+ dcae_hvves_docker: "1.0.0-SNAPSHOT"
+ dcae_datafile_docker: "1.0.0"
+ dcae_cm_docker: "1.4.1"
+ dcae_tca_docker: "1.1.0"
+ dcae_tca2_docker: "1.0.0"
+ dcae_cbs_docker: "2.2.3"
+ dcae_dh_docker: "3.0.2"
+ dcae_inv_docker: "3.0.4"
+ dcae_ph_docker: "4.3.1"
+ dcae_sch_docker: "1.1.5"
+ dcae_prh_docker: "1.0.0"
+ dcae_heartbeat_docker: "1.3.0"
+ dcae_mua_docker: "0.0.1"
+ dcae_msnmp_docker: "latest"
holmes_rm_docker: "1.2.0-STAGING-latest"
holmes_em_docker: "1.2.0-STAGING-latest"
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 1a877ece..18ac6d62 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -282,74 +282,94 @@ parameters:
dcae_docker:
type: string
default: latest
- dcae_snmptrap_docker:
+ dcae_bootstrap_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.collectors.snmptrap
- dcae_ves_docker:
+ description: Docker image version for onap/org.onap.dcaegen2.deployments.bootstrap
+ dcae_k8sbootstrap_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.collectors.ves.vescollector
- dcae_hvves_docker:
+ description: Docker image version for onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container
+ dcae_redisc_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.collectors.hv-ves
- dcae_datafile_docker:
+ description: Docker image version for onap/org.onap.dcaegen2.deployments.redis-cluster-container
+ dcae_hc_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.collectors.datafile
- dcae_bootstrap_docker:
+ description: Docker image version for onap/org.onap.dcaegen2.deployments.healthcheck-container
+ dcae_tls_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.deployments.bootstrap
- dcae_cm_docker:
+ description: Docker image version for onap/org.onap.dcaegen2.deployments.tls-init-container
+ dcae_cb_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.deployments.cm-container
- dcae_k8sbootstrap_docker:
+ description: Docker image version for onap/org.onap.dcaegen2.platform.cdapbroker
+ dcae_snmptrap_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.deployments.k8s-bootstrap-container
- dcae_redisc_docker:
+ description: Docker image version for onap/org.onap.dcaegen2.collectors.snmptrap
+ dcae_ves_docker:
+ type: string
+ default: latest
+ description: Docker image version for onap/org.onap.dcaegen2.collectors.ves.vescollector
+ dcae_hvves_docker:
+ type: string
+ default: latest
+ description: Docker image version for onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main
+ dcae_datafile_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.deployments.redis-cluster-container
+ description: Docker image version for onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server
+ dcae_cm_docker:
+ type: string
+ default: latest
+ description: Docker image version for onap/org.onap.dcaegen2.deployments.cm-container
dcae_tca_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.deployments.tca-cdap-container
- dcae_cb_docker:
+ description: Docker image version for onap/org.onap.dcaegen2.deployments.tca-cdap-container
+ dcae_tca2_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.platform.cdapbroker
+ description: Docker image version for onap/org.onap.dcaegen2.analytics.tca-gen2
dcae_cbs_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.platform.configbinding
+ description: Docker image version for onap/org.onap.dcaegen2.platform.configbinding.app-app
dcae_dh_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.platform.deployment-handler
+ description: Docker image version for onap/org.onap.dcaegen2.platform.deployment-handler
dcae_inv_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.platform.inventory-api
+ description: Docker image version for onap/org.onap.dcaegen2.platform.inventory-api
dcae_ph_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.platform.deployment-handler
+ description: Docker image version for onap/org.onap.dcaegen2.platform.policy-handler
dcae_sch_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.platform.servicechange-handler
+ description: Docker image version for onap/org.onap.dcaegen2.platform.servicechange-handler
+ dcae_prh_docker:
+ type: string
+ default: latest
+ description: Docker image version for onap/org.onap.dcaegen2.services.prh.prh-app-server
dcae_heartbeat_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.services.heartbeat
- dcae_prh_docker:
+ description: Docker image version for onap/org.onap.dcaegen2.services.heartbeat
+ dcae_mua_docker:
+ type: string
+ default: latest
+ description: Docker image version for onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor
+ dcae_msnmp_docker:
type: string
default: latest
- description: Docker image version for onap/org.dcaegen2.services.prh.prh-app-server
+ description: Docker image version for onap/org.onap.dcaegen2.services.mapper.vesadapter.snmpmapper
holmes_em_docker:
type: string
default: latest
@@ -2066,26 +2086,31 @@ resources:
__dcae_floating_ip_addr__: { get_attr: [dcae_floating_ip, floating_ip_address] }
# container versions
__dcae_docker__: { get_param: dcae_docker }
+ __dcae_bootstrap_docker__: { get_param: dcae_bootstrap_docker }
+ __dcae_k8sbootstrap_docker__: { get_param: dcae_k8sbootstrap_docker }
+ __dcae_redisc_docker__: { get_param: dcae_redisc_docker }
+ __dcae_hc_docker__: { get_param: dcae_hc_docker }
+ __dcae_tls_docker__: { get_param: dcae_tls_docker }
+ __dcae_cb_docker__: { get_param: dcae_cb_docker }
__dcae_snmptrap_docker__: { get_param: dcae_snmptrap_docker }
__dcae_ves_docker__: { get_param: dcae_ves_docker }
__dcae_hvves_docker__: { get_param: dcae_hvves_docker }
__dcae_datafile_docker__: { get_param: dcae_datafile_docker }
- __dcae_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_tca2_docker__: { get_param: dcae_tca2_docker }
__dcae_cbs_docker__: { get_param: dcae_cbs_docker }
__dcae_dh_docker__: { get_param: dcae_dh_docker }
__dcae_inv_docker__: { get_param: dcae_inv_docker }
__dcae_ph_docker__: { get_param: dcae_ph_docker }
__dcae_sch_docker__: { get_param: dcae_sch_docker }
- __dcae_heartbeat_docker__: { get_param: dcae_heartbeat_docker }
__dcae_prh_docker__: { get_param: dcae_prh_docker }
+ __dcae_heartbeat_docker__: { get_param: dcae_heartbeat_docker }
+ __dcae_mua_docker__: { get_param: dcae_mua_docker }
+ __dcae_msnmp_docker__: { get_param: dcae_msnmp_docker }
__holmes_em_docker__: { get_param: holmes_em_docker }
__holmes_rm_docker__: { get_param: holmes_rm_docker }
-
+
template: |
#!/bin/bash
@@ -2118,23 +2143,28 @@ resources:
echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt
# container versions
echo "__dcae_docker__" > /opt/config/dcae_docker.txt
+ echo "__dcae_bootstrap_docker__" > /opt/config/dcae_docker_bootstrap.txt
+ echo "__dcae_k8sbootstrap_docker__" > /opt/config/dcae_docker_k8sbootstrap.txt
+ echo "__dcae_redisc_docker__" > /opt/config/dcae_docker_redisc.txt
+ echo "__dcae_hc_docker__" > /opt/config/dcae_docker_hc.txt
+ echo "__dcae_tls_docker__" > /opt/config/dcae_docker_tls.txt
+ echo "__dcae_cb_docker__" > /opt/config/dcae_docker_cb.txt
echo "__dcae_snmptrap_docker__" > /opt/config/dcae_docker_snmptrap.txt
echo "__dcae_ves_docker__" > /opt/config/dcae_docker_ves.txt
echo "__dcae_hvves_docker__" > /opt/config/dcae_docker_hvves.txt
echo "__dcae_datafile_docker__" > /opt/config/dcae_docker_datafile.txt
- echo "__dcae_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_tca2_docker__" > /opt/config/dcae_docker_tca2.txt
echo "__dcae_cbs_docker__" > /opt/config/dcae_docker_cbs.txt
echo "__dcae_dh_docker__" > /opt/config/dcae_docker_dh.txt
echo "__dcae_inv_docker__" > /opt/config/dcae_docker_inv.txt
echo "__dcae_ph_docker__" > /opt/config/dcae_docker_ph.txt
echo "__dcae_sch_docker__" > /opt/config/dcae_docker_sch.txt
- echo "__dcae_heartbeat_docker__" > /opt/config/dcae_docker_heartbeat.txt
echo "__dcae_prh_docker__" > /opt/config/dcae_docker_prh.txt
+ echo "__dcae_heartbeat_docker__" > /opt/config/dcae_docker_heartbeat.txt
+ echo "__dcae_mua_docker__" > /opt/config/dcae_docker_mua.txt
+ echo "__dcae_msnmp_docker__" > /opt/config/dcae_docker_msnmp.txt
echo "__holmes_em_docker__" > /opt/config/holmes_docker_em.txt
echo "__holmes_rm_docker__" > /opt/config/holmes_docker_rm.txt
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 4deabdf1..d04c3d4f 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -152,21 +152,28 @@ parameters:
dbcl_docker: "${BUSCONTROLLER_DOCKER}"
dcae_docker: "${BOOTSTRAP_DOCKER}"
- dcae_snmptrap_docker: "${SNMPTRAP_DOCKER}"
- dcae_ves_docker: "${VESCOLLECTOR_DOCKER}"
- dcae_hvves_docker: "${HVVESCOLLECTOR_DOCKER}"
- dcae_datafile_docker: "${DATAFILECOLLECTOR_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_hc_docker: "${HEALTHCHECK_CONTAINER_DOCKER}"
+ dcae_tls_docker: "${TLS_INIT_CONTAINER_DOCKER}"
dcae_cb_docker: "${CDAPBROKER_DOCKER}"
- dcae_cbs_docker: "${CONFIGBINDING_DOCKER}"
+ dcae_snmptrap_docker: "${SNMPTRAP_DOCKER}"
+ dcae_ves_docker: "${VESCOLLECTOR_DOCKER}"
+ dcae_hvves_docker: "${HV_COLLECTOR_MAIN_DOCKER}"
+ dcae_datafile_docker: "${DATAFILE_APP_SERVER_DOCKER}"
+ dcae_cm_docker: "${CM_CONTAINER_DOCKER}"
+ dcae_tca_docker: "${TCA_CDAP_CONTAINER_DOCKER}"
+ dcae_tca2_docker: "${DCAE_ANALYTICS_TCA_WEB_DOCKER}"
+ dcae_cbs_docker: "${APP_APP_DOCKER}"
dcae_dh_docker: "${DEPLOYMENT_HANDLER_DOCKER}"
dcae_inv_docker: "${INVENTORY_API_DOCKER}"
dcae_ph_docker: "${POLICY_HANDLER_DOCKER}"
dcae_sch_docker: "${SERVICECHANGE_HANDLER_DOCKER}"
+ dcae_prh_docker: "${PRH_APP_SERVER_DOCKER}"
+ dcae_heartbeat_docker: "${HEARTBEAT_DOCKER}"
+ dcae_mua_docker: "${UNIVERSALVESADAPTOR_DOCKER}"
+ dcae_msnmp_docker: "${SNMPMAPPER_DOCKER}"
holmes_rm_docker: "${RULE_MANAGEMENT_DOCKER}"
holmes_em_docker: "${ENGINE_MANAGEMENT_DOCKER}"