From 491628b6f98298535d6b98c668f28c955f792d16 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 30 May 2018 14:28:45 -0700 Subject: [PATCH] Sync HEAT docker versions with docker-manifest.csv Sync docker versions to match docker-manifest.csv commit 603039d72995e36a7a366855fa714d2634e0a3ed Change-Id: I8462d094e058872f7f9aa592b81b10bf9a13f3fb Issue-ID: INT-495 Signed-off-by: Gary Wu --- heat/ONAP/onap_openstack.env | 10 +++++----- heat/ONAP/onap_openstack_template.env | 4 ---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 437a73c2..8ee8423d 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -122,8 +122,8 @@ parameters: sms_branch: master oof_branch: master - aai_docker: 1.2-STAGING-latest - aai_sparky_docker: 1.2-STAGING-latest + aai_docker: 1.2.1 + aai_sparky_docker: 1.2.1 appc_docker: 1.3.0-SNAPSHOT-latest so_docker: 1.2.1 policy_docker: 1.2.2 @@ -131,7 +131,7 @@ parameters: robot_docker: 1.2.0 sdc_docker: 1.2-STAGING-latest sdnc_docker: 1.3-STAGING-latest - vid_docker: 1.2.1 + vid_docker: 2.0-STAGING-latest clamp_docker: 2.0-STAGING-latest msb_docker: 1.1.0-STAGING-latest mvim_docker: 1.1.2-STAGING @@ -148,10 +148,10 @@ parameters: nbi_docker: latest dbcl_docker: latest - dcae_docker: 1.1.2 + dcae_docker: 1.1.3 dcae_snmptrap_docker: latest dcae_ves_docker: latest - dcae_bootstrap_docker: 1.1.2 + dcae_bootstrap_docker: 1.1.3 dcae_cm_docker: latest dcae_k8sbootstrap_docker: latest dcae_redisc_docker: latest diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index e0180c98..b6ae8eed 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -22,8 +22,6 @@ parameters: flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE - flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE - vm_base_name: onap key_name: onap_key @@ -52,8 +50,6 @@ parameters: openstack_region: RegionOne - horizon_url: PUT THE HORIZON URL HERE - keystone_url: PUT THE KEYSTONE URL HERE (do not include version number) cloud_env: openstack -- 2.16.6