diff options
| author |   Marco Platania <platania@research.att.com> | 2018-04-27 13:46:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-27 13:46:07 +0000 |
| commit | a54297b94084e5a2818273ed26d835f63514a75e (patch) | |
| tree | 03ff9bc2d78ecf2dab25d9bf9712cef5994d658d /heat/ONAP | |
| parent | af6264f6c850828ec4e54285b6f812c477741801 (diff) | |
| parent | 1303170788f39edd7ea8c585bb9267ab4f6ba943 (diff) | |
Merge "Maintain independent image version for M.C. plugin"
Diffstat (limited to 'heat/ONAP')
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 3 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_light.yaml | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_template.env | 3 |
4 files changed, 12 insertions, 2 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index b9f0856c..5c12403b 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -149,7 +149,8 @@ parameters: vid_docker: 1.2.1 clamp_docker: 2.0-STAGING-latest msb_docker: 1.1.0-STAGING-latest - mvim_docker: v1.0.0 + mvim_docker: 1.1.0-SNAPSHOT + mvim_openstack_docker: 1.1.2-SNAPSHOT uui_docker: 1.1.0-SNAPSHOT-STAGING-latest esr_docker: 1.1.0-SNAPSHOT sdc_wfd_docker: 1.1.0-SNAPSHOT-STAGING-latest diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index a63ff1aa..21573cfd 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -410,6 +410,8 @@ parameters: type: string mvim_docker: type: string + mvim_openstack_docker: + type: string uui_docker: type: string esr_docker: @@ -1674,6 +1676,7 @@ resources: __vnfsdk_branch__: { get_param: vnfsdk_branch } __msb_docker__: { get_param: msb_docker } __mvim_docker__: { get_param: mvim_docker } + __mvim_openstack_docker__: { get_param: mvim_openstack_docker } __uui_docker__: { get_param: uui_docker } __esr_docker__: { get_param: esr_docker } __vnfsdk_repo__: { get_param: vnfsdk_repo } @@ -1714,6 +1717,7 @@ resources: echo "__vnfsdk_branch__" > /opt/config/vnfsdk_branch.txt echo "__msb_docker__" > /opt/config/msb_docker.txt echo "__mvim_docker__" > /opt/config/mvim_docker.txt + echo "__mvim_openstack_docker__" > /opt/config/mvim_openstack_docker.txt echo "__uui_docker__" > /opt/config/uui_docker.txt echo "__esr_docker__" > /opt/config/esr_docker.txt echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml index f72f3d53..4df12aac 100644 --- a/heat/ONAP/onap_openstack_light.yaml +++ b/heat/ONAP/onap_openstack_light.yaml @@ -335,6 +335,8 @@ parameters: type: string mvim_docker: type: string + mvim_openstack_docker: + type: string uui_docker: type: string esr_docker: @@ -1594,6 +1596,7 @@ resources: __vnfsdk_branch__: { get_param: vnfsdk_branch } __msb_docker__: { get_param: msb_docker } __mvim_docker__: { get_param: mvim_docker } + __mvim_openstack_docker__: { get_param: mvim_openstack_docker } __uui_docker__: { get_param: uui_docker } __esr_docker__: { get_param: esr_docker } __vnfsdk_repo__: { get_param: vnfsdk_repo } @@ -1634,6 +1637,7 @@ resources: echo "__vnfsdk_branch__" > /opt/config/vnfsdk_branch.txt echo "__msb_docker__" > /opt/config/msb_docker.txt echo "__mvim_docker__" > /opt/config/mvim_docker.txt + echo "__mvim_openstack_docker__" > /opt/config/mvim_openstack_docker.txt echo "__uui_docker__" > /opt/config/uui_docker.txt echo "__esr_docker__" > /opt/config/esr_docker.txt echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index 63046011..b81cc67f 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -150,6 +150,7 @@ parameters: clamp_docker: ${CLAMP_DOCKER} msb_docker: ${MSB_APIGATEWAY_DOCKER} mvim_docker: ${FRAMEWORK_DOCKER} + mvim_openstack_docker: ${MC_OPENSTACK_DOCKER} uui_docker: ${USECASE_UI_SERVER_DOCKER} esr_docker: ${ESR_SERVER_DOCKER} sdc_wfd_docker: ${SDC_WORKFLOW_DESIGNER_DOCKER} @@ -228,4 +229,4 @@ parameters: music_repo: http://gerrit.onap.org/r/music.git nbi_repo: http://gerrit.onap.org/r/externalapi/nbi.git aaf_repo: http://gerrit.onap.org/r/aaf/authz.git - oof_repo: http://gerrit.onap.org/r/optf/has.git
\ No newline at end of file + oof_repo: http://gerrit.onap.org/r/optf/has.git |