X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.yaml;h=0a306849d0a5202804496d37a6e0a997b3fe6f71;hb=6240d5685c0941c1efe87a6d89312bb72f5591c0;hp=27f532709da656c33f82c96c4797ad17eac283ce;hpb=85a455d52ab680bad0e581f298608fc25cad029a;p=demo.git diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 27f53270..0a306849 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -878,7 +878,7 @@ resources: __artifacts_version__: { get_param: artifacts_version } __openstack_region__: { get_param: openstack_region } __dns_ip_addr__: { get_param: dns_ip_addr } - __gerrit_branch__: { get_param: mr_branch } + __gerrit_branch__: { get_param: robot_branch } __cloud_env__: { get_param: cloud_env } __keystone_url__: { get_param: keystone_url } __aai1_ip_addr__: { get_param: aai1_ip_addr } @@ -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 }