summaryrefslogtreecommitdiffstats
path: root/heat
diff options
context:
space:
mode:
authorDileep Ranganathan <dileep.ranganathan@intel.com>2018-06-06 11:58:14 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-06-06 20:16:06 -0700
commit3f5434179d1721dc8f201b687910e9193ff38622 (patch)
tree2737ac6c216991ca648989d9d7cc791960ee8f37 /heat
parent87c9574f9a546f606082de6ff37bc1c3d7cad805 (diff)
Replace docker version tags for OOF
Replace docker version tags to read from HEAT template Change-Id: Iacdaa2956e1a7a889cd00f440d81d248f56337af Issue-ID: OPTFRA-257 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com> Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'heat')
-rw-r--r--heat/ONAP/onap_openstack.env4
-rw-r--r--heat/ONAP/onap_openstack.yaml16
-rw-r--r--heat/ONAP/onap_openstack_template.env4
3 files changed, 19 insertions, 5 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 39bbc8ec..16894ea1 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -143,7 +143,9 @@ parameters:
dgbuilder_docker: 0.2.4
cli_docker: 2.0.2
music_docker: 2.5.3
- oof_docker: 1.1.1
+ cassandra_music_docker: 3.0.0
+ optf_has_docker: 1.1.1
+ optf_osdf_docker: 1.1.1
aaf_docker: 2.1.1
sms_docker: 2.0.0
nbi_docker: 2.0.0
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 45b6523b..98848c4f 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -438,7 +438,11 @@ parameters:
type: string
music_docker:
type: string
- oof_docker:
+ cassandra_music_docker:
+ type: string
+ optf_has_docker:
+ type: string
+ optf_osdf_docker:
type: string
aaf_docker:
type: string
@@ -2164,7 +2168,10 @@ resources:
__nexus_password__: { get_param: nexus_password }
__artifacts_version__: { get_param: artifacts_version }
__dns_ip_addr__: { get_param: dns_ip_addr }
- __docker_version__: { get_param: oof_docker }
+ __has_docker_version__: { get_param: optf_has_docker }
+ __osdf_docker_version__: { get_param: optf_osdf_docker }
+ __music_docker_version__: { get_param: music_docker }
+ __cass_music_docker_version__: { get_param: cassandra_music_docker }
__oof_repo__: { get_param: oof_repo }
__gerrit_branch__: { get_param: oof_branch }
__cloud_env__: { get_param: cloud_env }
@@ -2180,7 +2187,10 @@ resources:
echo "__nexus_password__" > /opt/config/nexus_password.txt
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 "__has_docker_version__" > /opt/config/has_docker_version.txt
+ echo "__osdf_docker_version__" > /opt/config/osdf_docker_version.txt
+ echo "__music_docker_version__" > /opt/config/music_version.txt
+ echo "__cass_music_docker_version__" > /opt/config/cass_version.txt
echo "__oof_repo__" > /opt/config/remote_repo.txt
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
echo "__cloud_env__" > /opt/config/cloud_env.txt
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 16c94d2a..33785861 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -143,7 +143,9 @@ parameters:
dgbuilder_docker: ${CCSDK_DGBUILDER_IMAGE_DOCKER}
cli_docker: ${CLI_DOCKER}
music_docker: ${MUSIC_DOCKER}
- oof_docker: ${OPTF_OSDF_DOCKER}
+ cassandra_music_docker: ${CASSANDRA_MUSIC_DOCKER}
+ optf_has_docker: ${OPTF_HAS_DOCKER}
+ optf_osdf_docker: ${OPTF_OSDF_DOCKER}
aaf_docker: ${AAF_SERVICE_DOCKER}
sms_docker: ${SMS_DOCKER}
nbi_docker: ${NBI_DOCKER}