diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-09-11 13:55:21 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-09-11 14:07:11 +0400 |
| commit | 0dacfaa2fbd2dfe7fc9d438b9350a0187506e61c (patch) | |
| tree | d1188a717fc589eee240f2201fc6e46f18185ecf | |
| parent | d75a13621de68b122189301a761b3802f9b86ef1 (diff) | |
Pass flavor metadata into heat template
Change-Id: I660c7421c9c43d4603cf05489ca39f781467e3a1
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
| -rw-r--r-- | snaps/openstack/tests/create_stack_tests.py | 1 | ||||
| -rw-r--r-- | snaps/openstack/tests/heat/floating_ip_heat_template.yaml | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/snaps/openstack/tests/create_stack_tests.py b/snaps/openstack/tests/create_stack_tests.py index be4d6ea..7da5bc7 100644 --- a/snaps/openstack/tests/create_stack_tests.py +++ b/snaps/openstack/tests/create_stack_tests.py @@ -448,6 +448,7 @@ class CreateStackFloatingIpTests(OSIntegrationTestCase): 'image2_name': self.image_creator.image_settings.name, 'flavor1_name': self.flavor1_name, 'flavor2_name': self.flavor2_name, + 'flavor_extra_specs': self.flavor_metadata, 'net_name': self.network_name, 'subnet_name': self.subnet_name, 'inst1_name': self.vm_inst1_name, diff --git a/snaps/openstack/tests/heat/floating_ip_heat_template.yaml b/snaps/openstack/tests/heat/floating_ip_heat_template.yaml index 40626b9..e64c7fc 100644 --- a/snaps/openstack/tests/heat/floating_ip_heat_template.yaml +++ b/snaps/openstack/tests/heat/floating_ip_heat_template.yaml @@ -41,6 +41,10 @@ parameters: label: Instance Flavor for second VM description: Flavor name for the second instance default: m1.med + flavor_extra_specs: + type: json + description: Instance Flavor extra specs + default: {} net_name: type: string label: Test network name @@ -88,12 +92,14 @@ resources: ram: 1024 vcpus: 2 disk: 2 + extra_specs: { get_param: flavor_extra_specs } flavor2: type: OS::Nova::Flavor properties: ram: 1024 vcpus: 2 disk: 2 + extra_specs: { get_param: flavor_extra_specs } network: type: OS::Neutron::Net |