aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/ceph-storage.yaml
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2016-07-26 12:27:44 +0100
committerSteven Hardy <shardy@redhat.com>2016-07-27 17:04:59 +0100
commit1c5a7c32835ca44934447b24cd6a5c542cb7b296 (patch)
tree890f44e6a101424873043ca5a6aa0be67b2b6943 /puppet/ceph-storage.yaml
parent80a1acb55ed60b1bf86e9cf2d463dbe814c2489f (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/ceph-storage.yaml')
-rw-r--r--puppet/ceph-storage.yaml5
1 files changed, 3 insertions, 2 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index 4d489c82..b5345d88 100644
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -1,8 +1,9 @@
heat_template_version: 2015-04-30
description: 'OpenStack ceph storage node configured by Puppet'
parameters:
- Flavor:
+ OvercloudCephStorageFlavor:
description: Flavor for the Ceph Storage node.
+ default: baremetal
type: string
constraints:
- custom_constraint: nova.flavor
@@ -108,7 +109,7 @@ resources:
properties:
image: {get_param: CephStorageImage}
image_update_policy: {get_param: ImageUpdatePolicy}
- flavor: {get_param: Flavor}
+ flavor: {get_param: OvercloudCephStorageFlavor}
key_name: {get_param: KeyName}
networks:
- network: ctlplane