Code Review
/
snaps.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Pass flavor metadata into heat template
[snaps.git]
/
snaps
/
openstack
/
tests
/
heat
/
floating_ip_heat_template.yaml
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
(file)
--- 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
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
net_name:
type: string
label: Test network name
@@
-88,12
+92,14
@@
resources:
ram: 1024
vcpus: 2
disk: 2
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
flavor2:
type: OS::Nova::Flavor
properties:
ram: 1024
vcpus: 2
disk: 2
+ extra_specs: { get_param: flavor_extra_specs }
network:
type: OS::Neutron::Net
network:
type: OS::Neutron::Net