From: Marco Platania <platania@research.att.com>
Date: Fri, 5 Jan 2018 14:54:32 +0000 (+0000)
Subject: Merge "Update policy docker v1.1.2" into amsterdam
X-Git-Tag: 1.0.1-Amsterdam~9
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2176b04f1e787145e850890c05798936bd9def55;hp=3f65668acbd8b6962d29ac95a9d50ba856b89453;p=demo.git

Merge "Update policy docker v1.1.2" into amsterdam
---

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index ff9b1c52..0a306849 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -1647,8 +1647,8 @@ resources:
             __dcaeos_public_network_name__: { get_param: public_net_name }
             __dcaeos_ubuntu_1604_image__: { get_param: ubuntu_1604_image }
             __dcaeos_centos_7_image__: { get_param: dcae_centos_7_image }
-            __dcaeos_flavor_id__: { get_param: flavor_xlarge }
-            __dcaeos_flavor_id_cdap__: { get_param: flavor_xlarge }
+            __dcaeos_flavor_id__: { get_param: flavor_medium }
+            __dcaeos_flavor_id_cdap__: { get_param: flavor_large }
             __dcaeos_dnsaas_config_enabled__: { get_param: dnsaas_config_enabled }
             __dcaeos_dnsaas_region__: { get_param: dnsaas_region }
             __dcaeos_dnsaas_keystone_url__: { get_param: dnsaas_keystone_url }