Gracefully handle missing docker image versions

Quote the docker image versions so that images
missing versions in the manifest will not fail
the HEAT deployment.

Change-Id: I785ada4bec82518d29434ae7943443440f89ec95
Issue-ID: INT-586
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 2cef506..1aa7d22 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -125,69 +125,69 @@ parameters:
   sms_branch: master
   oof_branch: master
 
-  aai_docker: 1.2.2
-  appc_docker: 1.3.0
-  so_docker: 1.2.2
-  policy_docker: 1.2.3
-  portal_docker: 2.2.0
-  robot_docker: 1.2.1
-  sniro_docker: 1.0.0
-  sdc_docker: 1.2.0
-  sdnc_docker: 1.3.4
-  vid_docker: 2.0.0
-  clamp_docker: 2.0.2
-  msb_docker: 1.1.0
-  mvim_docker: 1.1.2
-  mvim_openstack_docker: 1.1.2
-  uui_docker: 1.1.1
-  esr_docker: 1.1.0
-  sdc_wfd_docker: 1.1.0
-  dgbuilder_docker: 0.2.4
-  cli_docker: 2.0.2
-  music_docker: 2.5.3
-  cassandra_music_docker: 3.0.0
-  optf_has_docker: 1.1.1
-  optf_osdf_docker: 1.1.1
-  aaf_docker: 2.1.1
-  sms_docker: 2.0.0
-  nbi_docker: 2.0.0
-  dbcl_docker: 1.0.12
-
-  dcae_docker:  1.1.3
-  dcae_snmptrap_docker:  1.3.0
-  dcae_ves_docker:  1.2.0
-  dcae_bootstrap_docker: 1.1.3
-  dcae_cm_docker: 1.3.0
-  dcae_k8sbootstrap_docker: 1.1.11
-  dcae_redisc_docker: 1.0.0
-  dcae_tca_docker: 1.1.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
-  holmes_rm_docker: 1.1.0
-  holmes_em_docker: 1.1.0
-
-  vfc_db_docker: 1.1.0
-  vfc_nokia_docker: 1.1.0
-  vfc_nokiav2_docker: 1.1.0
-  vfc_ztevnfmdriver_docker: 1.1.0
-  vfc_ztesdncdriver_docker: 1.1.0
-  vfc_vnfres_docker: 1.1.0
-  vfc_vnfmgr_docker: 1.1.0
-  vfc_vnflcm_docker: 1.1.0
-  vfc_resmanagement_docker: 1.1.0
-  vfc_nslcm_docker: 1.1.0
-  vfc_huawei_docker: 1.1.0
-  vfc_jujudriver_docker: 1.1.0
-  vfc_gvnfmdriver_docker: 1.1.0
-  vfc_emsdriver_docker: 1.1.0
-  vfc_catalog_docker: 1.1.0
-  vfc_wfengine_mgrservice_docker: 1.1.0
-  vfc_wfengine_activiti_docker: 1.1.0
-  vfc_multivimproxy_docker: 1.0.0
+  aai_docker: "1.2.2"
+  appc_docker: "1.3.0"
+  so_docker: "1.2.2"
+  policy_docker: "1.2.3"
+  portal_docker: "2.2.0"
+  robot_docker: "1.3.0"
+  sniro_docker: "1.0.0"
+  sdc_docker: "1.2.0"
+  sdnc_docker: "1.3.4"
+  vid_docker: "2.0.0"
+  clamp_docker: "2.0.2"
+  msb_docker: "1.1.0"
+  mvim_docker: "1.1.2"
+  mvim_openstack_docker: "1.1.2"
+  uui_docker: "1.1.1"
+  esr_docker: "1.1.0"
+  sdc_wfd_docker: "1.1.0"
+  dgbuilder_docker: "0.2.4"
+  cli_docker: "2.0.2"
+  music_docker: "2.5.3"
+  cassandra_music_docker: "3.0.0"
+  optf_has_docker: "1.1.1"
+  optf_osdf_docker: "1.1.1"
+  aaf_docker: "2.1.1"
+  sms_docker: "2.0.0"
+  nbi_docker: "2.0.0"
+  dbcl_docker: "1.0.12"
+
+  dcae_docker: "1.1.3"
+  dcae_snmptrap_docker: "1.3.0"
+  dcae_ves_docker: "1.2.0"
+  dcae_bootstrap_docker: "1.1.3"
+  dcae_cm_docker: "1.3.0"
+  dcae_k8sbootstrap_docker: "1.1.11"
+  dcae_redisc_docker: "1.0.0"
+  dcae_tca_docker: "1.1.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"
+  holmes_rm_docker: "1.1.0"
+  holmes_em_docker: "1.1.0"
+
+  vfc_db_docker: ""
+  vfc_nokia_docker: "1.1.0"
+  vfc_nokiav2_docker: "1.1.0"
+  vfc_ztevnfmdriver_docker: "1.1.0"
+  vfc_ztesdncdriver_docker: "1.1.0"
+  vfc_vnfres_docker: "1.1.0"
+  vfc_vnfmgr_docker: "1.1.0"
+  vfc_vnflcm_docker: "1.1.0"
+  vfc_resmanagement_docker: "1.1.0"
+  vfc_nslcm_docker: "1.1.0"
+  vfc_huawei_docker: "1.1.0"
+  vfc_jujudriver_docker: "1.1.0"
+  vfc_gvnfmdriver_docker: "1.1.0"
+  vfc_emsdriver_docker: "1.1.0"
+  vfc_catalog_docker: "1.1.0"
+  vfc_wfengine_mgrservice_docker: "1.1.0"
+  vfc_wfengine_activiti_docker: "1.1.0"
+  vfc_multivimproxy_docker: "1.0.0"
 
   #####################
   #                   #

diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 0a60ce1..5ca2b54 100644 (file)
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -125,69 +125,69 @@ parameters:
   sms_branch: master
   oof_branch: master
 
-  aai_docker: ${AAI_RESOURCES_DOCKER}
-  appc_docker: ${APPC_IMAGE_DOCKER}
-  so_docker: ${MSO_DOCKER}
-  policy_docker: ${POLICY_PE_DOCKER}
-  portal_docker: ${PORTAL_APP_DOCKER}
-  robot_docker: ${TESTSUITE_DOCKER}
-  sniro_docker: ${SNIROEMULATOR_DOCKER}
-  sdc_docker: ${SDC_BACKEND_DOCKER}
-  sdnc_docker: ${SDNC_IMAGE_DOCKER}
-  vid_docker: ${VID_DOCKER}
-  clamp_docker: ${CLAMP_DOCKER}
-  msb_docker: ${MSB_APIGATEWAY_DOCKER}
-  mvim_docker: ${FRAMEWORK_DOCKER}
-  mvim_openstack_docker: ${OPENSTACK_OCATA_DOCKER}
-  uui_docker: ${USECASE_UI_SERVER_DOCKER}
-  esr_docker: ${ESR_SERVER_DOCKER}
-  sdc_wfd_docker: ${SDC_WORKFLOW_DESIGNER_DOCKER}
-  dgbuilder_docker: ${CCSDK_DGBUILDER_IMAGE_DOCKER}
-  cli_docker: ${CLI_DOCKER}
-  music_docker: ${MUSIC_DOCKER}
-  cassandra_music_docker: ${CASSANDRA_MUSIC_DOCKER}
-  optf_has_docker: ${OPTF_HAS_DOCKER}
-  optf_osdf_docker: ${OPTF_OSDF_DOCKER}
-  aaf_docker: ${AAF_SERVICE_DOCKER}
-  sms_docker: ${SMS_DOCKER}
-  nbi_docker: ${NBI_DOCKER}
-  dbcl_docker: ${BUSCONTROLLER_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}
-  holmes_rm_docker: ${RULE_MANAGEMENT_DOCKER}
-  holmes_em_docker: ${ENGINE_MANAGEMENT_DOCKER}
-
-  vfc_db_docker: ${DB_DOCKER}
-  vfc_nokia_docker: ${NOKIA_DOCKER}
-  vfc_nokiav2_docker: ${NOKIAV2_DOCKER}
-  vfc_ztevnfmdriver_docker: ${ZTEVNFMDRIVER_DOCKER}
-  vfc_ztesdncdriver_docker: ${ZTESDNCDRIVER_DOCKER}
-  vfc_vnfres_docker: ${VNFRES_DOCKER}
-  vfc_vnfmgr_docker: ${VNFMGR_DOCKER}
-  vfc_vnflcm_docker: ${VNFLCM_DOCKER}
-  vfc_resmanagement_docker: ${RESMANAGEMENT_DOCKER}
-  vfc_nslcm_docker: ${NSLCM_DOCKER}
-  vfc_huawei_docker: ${HUAWEI_DOCKER}
-  vfc_jujudriver_docker: ${JUJUDRIVER_DOCKER}
-  vfc_gvnfmdriver_docker: ${GVNFMDRIVER_DOCKER}
-  vfc_emsdriver_docker: ${EMSDRIVER_DOCKER}
-  vfc_catalog_docker: ${CATALOG_DOCKER}
-  vfc_wfengine_mgrservice_docker: ${WFENGINE_MGRSERVICE_DOCKER}
-  vfc_wfengine_activiti_docker: ${WFENGINE_ACTIVITI_DOCKER}
-  vfc_multivimproxy_docker: ${MULTIVIMPROXY_DOCKER}
+  aai_docker: "${AAI_RESOURCES_DOCKER}"
+  appc_docker: "${APPC_IMAGE_DOCKER}"
+  so_docker: "${MSO_DOCKER}"
+  policy_docker: "${POLICY_PE_DOCKER}"
+  portal_docker: "${PORTAL_APP_DOCKER}"
+  robot_docker: "${TESTSUITE_DOCKER}"
+  sniro_docker: "${SNIROEMULATOR_DOCKER}"
+  sdc_docker: "${SDC_BACKEND_DOCKER}"
+  sdnc_docker: "${SDNC_IMAGE_DOCKER}"
+  vid_docker: "${VID_DOCKER}"
+  clamp_docker: "${CLAMP_DOCKER}"
+  msb_docker: "${MSB_APIGATEWAY_DOCKER}"
+  mvim_docker: "${FRAMEWORK_DOCKER}"
+  mvim_openstack_docker: "${OPENSTACK_OCATA_DOCKER}"
+  uui_docker: "${USECASE_UI_SERVER_DOCKER}"
+  esr_docker: "${ESR_SERVER_DOCKER}"
+  sdc_wfd_docker: "${SDC_WORKFLOW_DESIGNER_DOCKER}"
+  dgbuilder_docker: "${CCSDK_DGBUILDER_IMAGE_DOCKER}"
+  cli_docker: "${CLI_DOCKER}"
+  music_docker: "${MUSIC_DOCKER}"
+  cassandra_music_docker: "${CASSANDRA_MUSIC_DOCKER}"
+  optf_has_docker: "${OPTF_HAS_DOCKER}"
+  optf_osdf_docker: "${OPTF_OSDF_DOCKER}"
+  aaf_docker: "${AAF_SERVICE_DOCKER}"
+  sms_docker: "${SMS_DOCKER}"
+  nbi_docker: "${NBI_DOCKER}"
+  dbcl_docker: "${BUSCONTROLLER_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}"
+  holmes_rm_docker: "${RULE_MANAGEMENT_DOCKER}"
+  holmes_em_docker: "${ENGINE_MANAGEMENT_DOCKER}"
+
+  vfc_db_docker: "${DB_DOCKER}"
+  vfc_nokia_docker: "${NOKIA_DOCKER}"
+  vfc_nokiav2_docker: "${NOKIAV2_DOCKER}"
+  vfc_ztevnfmdriver_docker: "${ZTEVNFMDRIVER_DOCKER}"
+  vfc_ztesdncdriver_docker: "${ZTESDNCDRIVER_DOCKER}"
+  vfc_vnfres_docker: "${VNFRES_DOCKER}"
+  vfc_vnfmgr_docker: "${VNFMGR_DOCKER}"
+  vfc_vnflcm_docker: "${VNFLCM_DOCKER}"
+  vfc_resmanagement_docker: "${RESMANAGEMENT_DOCKER}"
+  vfc_nslcm_docker: "${NSLCM_DOCKER}"
+  vfc_huawei_docker: "${HUAWEI_DOCKER}"
+  vfc_jujudriver_docker: "${JUJUDRIVER_DOCKER}"
+  vfc_gvnfmdriver_docker: "${GVNFMDRIVER_DOCKER}"
+  vfc_emsdriver_docker: "${EMSDRIVER_DOCKER}"
+  vfc_catalog_docker: "${CATALOG_DOCKER}"
+  vfc_wfengine_mgrservice_docker: "${WFENGINE_MGRSERVICE_DOCKER}"
+  vfc_wfengine_activiti_docker: "${WFENGINE_ACTIVITI_DOCKER}"
+  vfc_multivimproxy_docker: "${MULTIVIMPROXY_DOCKER}"
 
   #####################
   #                   #