summaryrefslogtreecommitdiffstats
path: root/heat
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2018-04-09 09:18:43 +0800
committeryangyan <yangyanyj@chinamobile.com>2018-04-10 09:14:23 +0800
commitbce131637836b6f5e57f64c32bc28a1762a1fac8 (patch)
tree49e3bd91a1e24eccef6555702087ca2d08eb2a4d /heat
parentdb228e6370e5257ca59e4f0e7154f45991c7defa (diff)
Update vfc_vm_init script
Issue-ID: VFC-866 Change-Id: Icdf677ca953f2499b50bb73d14cb15d051a2d910 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
Diffstat (limited to 'heat')
-rw-r--r--heat/ONAP/onap_openstack.env1
-rw-r--r--heat/ONAP/onap_openstack.yaml2
-rw-r--r--heat/ONAP/onap_openstack_light.yaml2
3 files changed, 4 insertions, 1 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index a79a188d..1db5408d 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -173,7 +173,6 @@ parameters:
vfc_wfengine_mgrservice_docker: latest
vfc_wfengine_activiti_docker: latest
vfc_multivimproxy_docker: 1.0.0-STAGING-latest
- vfc_ztevmanagerdriver_docker: 1.0.3-STAGING-latest
############################################
# #
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 98d850bb..503d241d 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -1587,6 +1587,7 @@ resources:
__cbam_username__: { get_param: cbam_username }
__cbam_password__: { get_param: cbam_password }
__vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
+ __vfc_multivimproxy_docker__: { get_param: vfc_multivimproxy_docker }
__vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker }
__vfc_vnfres_docker__: { get_param: vfc_vnfres_docker }
__vfc_vnfmgr_docker__: { get_param: vfc_vnfmgr_docker }
@@ -1626,6 +1627,7 @@ resources:
echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt
echo "export NOKIAV2_DOCKER_VER=__vfc_nokiav2_docker__" >> /opt/config/vfc_docker.txt
+ echo "export MULTIVIMPROXY_DOCKER_VER=__vfc_multivimproxy_docker__" >> /opt/config/vfc_docker.txt
echo "export ZTEVNFMDRIVER_DOCKER_VER=__vfc_ztevnfmdriver_docker__" >> /opt/config/vfc_docker.txt
echo "export ZTESDNCDRIVER_DOCKER_VER=__vfc_ztesdncdriver_docker__" >> /opt/config/vfc_docker.txt
echo "export VNFRES_DOCKER_VER=__vfc_vnfres_docker__" >> /opt/config/vfc_docker.txt
diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml
index 0eb5e3e8..8e2b2f76 100644
--- a/heat/ONAP/onap_openstack_light.yaml
+++ b/heat/ONAP/onap_openstack_light.yaml
@@ -1576,6 +1576,7 @@ resources:
__cbam_username__: { get_param: cbam_username }
__cbam_password__: { get_param: cbam_password }
__vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
+ __vfc_multivimproxy_docker__: { get_param: vfc_multivimproxy_docker }
__vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker }
__vfc_vnfres_docker__: { get_param: vfc_vnfres_docker }
__vfc_vnfmgr_docker__: { get_param: vfc_vnfmgr_docker }
@@ -1615,6 +1616,7 @@ resources:
echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt
echo "export NOKIAV2_DOCKER_VER=__vfc_nokiav2_docker__" >> /opt/config/vfc_docker.txt
+ echo "export MULTIVIMPROXY_DOCKER_VER=__vfc_multivimproxy_docker__" >> /opt/config/vfc_docker.txt
echo "export ZTEVNFMDRIVER_DOCKER_VER=__vfc_ztevnfmdriver_docker__" >> /opt/config/vfc_docker.txt
echo "export ZTESDNCDRIVER_DOCKER_VER=__vfc_ztesdncdriver_docker__" >> /opt/config/vfc_docker.txt
echo "export VNFRES_DOCKER_VER=__vfc_vnfres_docker__" >> /opt/config/vfc_docker.txt