diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-10-31 15:42:22 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-10-31 15:42:22 +0000 |
commit | 897c8b8aa9295b0214f35bd08ac42416078904f5 (patch) | |
tree | 9435e9b852b35661e45c166f4bd9c7ffa116b674 /overcloud-without-mergepy.yaml | |
parent | 4bfb71e1ed3991370728e049d689f0e6e2a4c216 (diff) | |
parent | 928cd735f30752152e50a3b20145f899cb1b961c (diff) |
Merge "Use parameter constraints for image, key and flavor"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
-rw-r--r-- | overcloud-without-mergepy.yaml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 4df8587d..e171ff82 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -59,6 +59,8 @@ parameters: default: default description: Name of an existing EC2 KeyPair to enable SSH access to the instances type: string + constraints: + - custom_constraint: nova.keypair NeutronBridgeMappings: description: > The OVS logical->physical bridge mappings to use. See the Neutron @@ -185,10 +187,14 @@ parameters: controllerImage: type: string default: overcloud-control + constraints: + - custom_constraint: glance.image OvercloudControlFlavor: default: baremetal description: Flavor for control nodes to request when deploying. type: string + constraints: + - custom_constraint: nova.flavor ControlVirtualInterface: default: 'br-ex' description: Interface where virtual ip will be assigned. @@ -393,10 +399,14 @@ parameters: NovaImage: type: string default: overcloud-compute + constraints: + - custom_constraint: glance.image OvercloudComputeFlavor: description: Use this flavor type: string default: baremetal + constraints: + - custom_constraint: nova.flavor # Block storage specific parameters BlockStorageCount: |