summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-05-01 07:33:41 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-05-01 07:33:41 -0700
commit3850b6863771f6caf15764f67733bdf1df0811ab (patch)
tree9b6553175ba9ecaa4861e55269af12d86eefee89
parent028760b1624737a22adbd74922ebc6af42e7dcb6 (diff)
Sync HEAT template with docker manifest versions
Change-Id: Ib07445d93b44227599ecc52dc5fdf4b20050e4ab Issue-ID: INT-278 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--heat/ONAP/onap_openstack.env2
-rw-r--r--heat/ONAP/onap_openstack_template.env4
2 files changed, 3 insertions, 3 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 01eccf6a..fa421e4c 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -141,7 +141,7 @@ parameters:
aai_sparky_docker: 1.2-STAGING-latest
appc_docker: 1.3.0-SNAPSHOT-latest
so_docker: 1.2.1
- policy_docker: 1.2.0
+ policy_docker: v1.2.0
portal_docker: 2.1-STAGING-latest
robot_docker: 1.2-STAGING-latest
sdc_docker: 1.2-STAGING-latest
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index b81cc67f..6b11df00 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -150,7 +150,7 @@ parameters:
clamp_docker: ${CLAMP_DOCKER}
msb_docker: ${MSB_APIGATEWAY_DOCKER}
mvim_docker: ${FRAMEWORK_DOCKER}
- mvim_openstack_docker: ${MC_OPENSTACK_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}
@@ -160,7 +160,7 @@ parameters:
oof_docker: ${OOF_DOCKER}
aaf_docker: ${AAF_DOCKER}
nbi_docker: ${NBI_DOCKER}
- dbcl_docker: ${DBCL_DOCKER}
+ dbcl_docker: ${BUSCONTROLLER_DOCKER}
dcae_docker: ${BOOTSTRAP_DOCKER}
dcae_snmptrap_docker: ${SNMPTRAP_DOCKER}