diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-09 02:45:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-09 02:45:31 +0000 |
| commit | 6bba45ac28b166d69ed1aec1d3381cb56a4bc470 (patch) | |
| tree | b9d59a8e0493f56721b3f07e2201ccbf6daf65fc /puppet/compute.yaml | |
| parent | dd8cb29d4e598a51fee04a4b6d8cf4a91cb82d97 (diff) | |
| parent | 1c5a7c32835ca44934447b24cd6a5c542cb7b296 (diff) | |
Merge "Move *Flavor parameters into per-role templates"
Diffstat (limited to 'puppet/compute.yaml')
| -rw-r--r-- | puppet/compute.yaml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml index 1ae55cd3..0f40634e 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -40,8 +40,9 @@ parameters: Additional hiera configuration to inject into the cluster. Note that NovaComputeExtraConfig takes precedence over ExtraConfig. type: json - Flavor: + OvercloudComputeFlavor: description: Flavor for the nova compute node + default: baremetal type: string constraints: - custom_constraint: nova.flavor @@ -231,7 +232,7 @@ resources: image: {get_param: NovaImage} image_update_policy: get_param: ImageUpdatePolicy - flavor: {get_param: Flavor} + flavor: {get_param: OvercloudComputeFlavor} key_name: {get_param: KeyName} networks: - network: ctlplane |