diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-04-10 21:20:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-10 21:20:49 +0000 |
| commit | 2b9edd3824ff1fedae2539cad04d4a84d83514a3 (patch) | |
| tree | 520ebab05fe066910337dd9cb0221661144dd0bf /heat | |
| parent | 77444b2f7f528ef21f810ac4eb69c2d5116a729d (diff) | |
| parent | 85c450840c6dd79833bd541507d98447d7b0010f (diff) | |
Merge "Install MUSIC containers via Heat"
Diffstat (limited to 'heat')
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 8 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_light.yaml | 8 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_template.env | 2 |
4 files changed, 20 insertions, 0 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 1db5408d..d252044d 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -132,6 +132,7 @@ parameters: vid_branch: master clamp_branch: master vnfsdk_branch: master + music_branch: master aai_docker: 1.2-STAGING-latest aai_sparky_docker: 1.2-STAGING-latest @@ -201,3 +202,4 @@ parameters: vid_repo: http://gerrit.onap.org/r/vid.git clamp_repo: http://gerrit.onap.org/r/clamp.git vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git + music_repo: http://gerrit.onap.org/r/music.git
\ No newline at end of file diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 12c466a6..b29218d5 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -294,6 +294,8 @@ parameters: type: string vnfsdk_repo: type: string + music_repo: + type: string ################################ # # @@ -412,6 +414,8 @@ parameters: type: string vnfsdk_branch: type: string + music_branch: + type: string ############# @@ -1877,6 +1881,8 @@ resources: __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } __docker_version__: { get_param: music_docker } + __music_repo__: { get_param: music_repo } + __gerrit_branch__: { get_param: music_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } template: | @@ -1891,6 +1897,8 @@ resources: echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt + echo "__music_repo__" > /opt/config/remote_repo.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml index 8e2b2f76..b530cfa7 100644 --- a/heat/ONAP/onap_openstack_light.yaml +++ b/heat/ONAP/onap_openstack_light.yaml @@ -290,6 +290,8 @@ parameters: type: string vnfsdk_repo: type: string + music_repo: + type: string ################################ # # @@ -406,6 +408,8 @@ parameters: type: string vnfsdk_branch: type: string + music_branch: + type: string ############# @@ -1865,6 +1869,8 @@ resources: __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } __docker_version__: { get_param: music_docker } + __music_repo__: { get_param: music_repo } + __gerrit_branch__: { get_param: music_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } template: | @@ -1879,6 +1885,8 @@ resources: echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt + echo "__music_repo__" > /opt/config/remote_repo.txt + echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index 233cd869..5bbd9ab4 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -132,6 +132,7 @@ parameters: vid_branch: master clamp_branch: master vnfsdk_branch: master + music_branch: master aai_docker: ${AAI_RESOURCES_DOCKER} aai_sparky_docker: ${AAI_RESOURCES_DOCKER} @@ -201,3 +202,4 @@ parameters: vid_repo: http://gerrit.onap.org/r/vid.git clamp_repo: http://gerrit.onap.org/r/clamp.git vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git + music_repo: http://gerrit.onap.org/r/music.git |