aboutsummaryrefslogtreecommitdiffstats
path: root/heat/ONAP
diff options
context:
space:
mode:
Diffstat (limited to 'heat/ONAP')
-rw-r--r--heat/ONAP/onap_openstack.env23
-rw-r--r--heat/ONAP/onap_openstack.yaml20
-rw-r--r--heat/ONAP/onap_openstack_template.env9
3 files changed, 34 insertions, 18 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index ccbe63d1..42b0b05c 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -36,7 +36,7 @@ parameters:
dmaap_topic: AUTO
- artifacts_version: 1.2.1-SNAPSHOT
+ artifacts_version: 1.2.1
openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
@@ -127,24 +127,27 @@ parameters:
appc_docker: 1.3.0
so_docker: 1.2.2
policy_docker: 1.2.3
- portal_docker: v2.2.0
+ portal_docker: 2.2.0
robot_docker: 1.2.1
+ sniro_docker: 1.0.0
sdc_docker: 1.2.0
sdnc_docker: 1.3.4
vid_docker: 2.0.0
clamp_docker: 2.0.2
msb_docker: 1.1.0
- mvim_docker: 1.1.2-STAGING
- mvim_openstack_docker: 1.1.2-SNAPSHOT
- uui_docker: latest
- esr_docker: latest
+ mvim_docker: 1.1.2
+ mvim_openstack_docker: 1.1.2
+ uui_docker: 1.1.1
+ esr_docker: 1.1.0
sdc_wfd_docker: 1.1.0
dgbuilder_docker: 0.2.4
cli_docker: 2.0.2
- music_docker: latest
- oof_docker: 1.1.1
+ music_docker: 2.5.3
+ 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: latest
+ sms_docker: 2.0.0
nbi_docker: 2.0.0
dbcl_docker: 1.0.12
@@ -162,8 +165,6 @@ parameters:
dcae_inv_docker: 3.0.1
dcae_ph_docker: 2.4.5
dcae_sch_docker: 1.1.4
- dcae_heartbeat_docker: latest
- dcae_prh_docker: latest
holmes_rm_docker: 1.1.0
holmes_em_docker: 1.1.0
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 92f119ea..98848c4f 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -410,6 +410,8 @@ parameters:
type: string
robot_docker:
type: string
+ sniro_docker:
+ type: string
sdc_docker:
type: string
sdc_wfd_docker:
@@ -436,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
@@ -1086,6 +1092,7 @@ resources:
__script_version__: { get_param: artifacts_version }
__robot_repo__: { get_param: robot_repo }
__docker_version__: { get_param: robot_docker }
+ __sniro_docker_version__: { get_param: sniro_docker }
__vnf_pub_key__: { get_param: pub_key }
__use_oam_net_for_robot__: { get_param: use_oam_net_for_robot }
template: |
@@ -1104,6 +1111,7 @@ resources:
echo "__openstack_region__" > /opt/config/region.txt
echo "__artifacts_version__" > /opt/config/artifacts_version.txt
echo "__docker_version__" > /opt/config/docker_version.txt
+ echo "__sniro_docker_version__" > /opt/config/sniro_docker_version.txt
echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
echo "__keystone_url__" > /opt/config/keystone.txt
@@ -2160,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 }
@@ -2176,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 6238bc2c..c6a93813 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -36,7 +36,7 @@ parameters:
dmaap_topic: AUTO
- artifacts_version: 1.2.1-SNAPSHOT
+ artifacts_version: 1.2.1
openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
@@ -129,6 +129,7 @@ parameters:
policy_docker: ${POLICY_PE_DOCKER}
portal_docker: ${PORTAL_APP_DOCKER}
robot_docker: ${TESTSUITE_DOCKER}
+ sniro_docker: ${SNIROEMULATOR_DOCKER}
sdc_docker: ${SDC_BACKEND_DOCKER}
sdnc_docker: ${SDNC_IMAGE_DOCKER}
vid_docker: ${VID_DOCKER}
@@ -142,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}
@@ -162,8 +165,6 @@ parameters:
dcae_inv_docker: ${INVENTORY_API_DOCKER}
dcae_ph_docker: ${POLICY_HANDLER_DOCKER}
dcae_sch_docker: ${SERVICECHANGE_HANDLER_DOCKER}
- dcae_heartbeat_docker: ${HEARTBEAT_DOCKER}
- dcae_prh_docker: ${PRH_APP_SERVER_DOCKER}
holmes_rm_docker: ${RULE_MANAGEMENT_DOCKER}
holmes_em_docker: ${ENGINE_MANAGEMENT_DOCKER}