diff options
| author |   Marco Platania <platania@research.att.com> | 2018-08-14 13:45:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-08-14 13:45:00 +0000 |
| commit | b2c608a794d454fffc738e691919fddf5ca1578b (patch) | |
| tree | ca4598cca8d4243bd056403ff70b6286193b5e0c /heat/ONAP | |
| parent | 27df8f3b5a676c6fa28fdc9675fd854d2f873220 (diff) | |
| parent | 07263e50f2f0680a63530f7bf3dfe7db526d8084 (diff) | |
Merge "Add vfc-db docker to vfc_vm_init.sh"
Diffstat (limited to 'heat/ONAP')
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 1 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_template.env | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 427a9ad8..2cef506d 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -170,6 +170,7 @@ parameters: 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 diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index e9866536..eaec4f42 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -459,6 +459,8 @@ parameters: dbcl_docker: type: string + vfc_db_docker: + type: string vfc_nokia_docker: type: string vfc_nokiav2_docker: @@ -1951,6 +1953,7 @@ resources: __uui_docker__: { get_param: uui_docker } __esr_docker__: { get_param: esr_docker } __vnfsdk_repo__: { get_param: vnfsdk_repo } + __vfc_db_docker__: { get_param: vfc_db_docker } __vfc_nokia_docker__: { get_param: vfc_nokia_docker } __vfc_nokiav2_docker__: { get_param: vfc_nokiav2_docker } __vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker } @@ -1981,6 +1984,7 @@ resources: echo "__esr_docker__" > /opt/config/esr_docker.txt echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt + echo "export DB_DOCKER_VER=__vfc_db_docker__" >> /opt/config/vfc_docker.txt 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 diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index e9c1cc19..0a60ce13 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -170,6 +170,7 @@ parameters: 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} |