diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-07-26 12:27:44 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2016-07-27 17:04:59 +0100 |
| commit | 1c5a7c32835ca44934447b24cd6a5c542cb7b296 (patch) | |
| tree | 890f44e6a101424873043ca5a6aa0be67b2b6943 /puppet/controller.yaml | |
| parent | 80a1acb55ed60b1bf86e9cf2d463dbe814c2489f (diff) | |
Move *Flavor parameters into per-role templates
We have some inconsistent naming here, but move them with their
current names for backwards compatibility, we can address the
deprecation of the inconsistent names at a future time.
This is required to enable jinja templating of roles in overcloud.yaml
Change-Id: I2ea673d9bc52967f9b7c25555059b964abf66966
Partially-Implements: blueprint custom-roles
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index dee27776..6ab9ceaf 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -93,8 +93,9 @@ parameters: ] } type: json - Flavor: + OvercloudControlFlavor: description: Flavor for control nodes to request when deploying. + default: baremetal type: string constraints: - custom_constraint: nova.flavor @@ -342,7 +343,7 @@ resources: properties: image: {get_param: controllerImage} image_update_policy: {get_param: ImageUpdatePolicy} - flavor: {get_param: Flavor} + flavor: {get_param: OvercloudControlFlavor} key_name: {get_param: KeyName} networks: - network: ctlplane |