From 1c5a7c32835ca44934447b24cd6a5c542cb7b296 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Tue, 26 Jul 2016 12:27:44 +0100 Subject: 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 --- puppet/swift-storage.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'puppet/swift-storage.yaml') diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml index a0111bff..3f8e1ce6 100644 --- a/puppet/swift-storage.yaml +++ b/puppet/swift-storage.yaml @@ -1,8 +1,9 @@ heat_template_version: 2015-04-30 description: 'OpenStack swift storage node configured by Puppet' parameters: - Flavor: + OvercloudSwiftStorageFlavor: description: Flavor for Swift storage nodes to request when deploying. + default: baremetal type: string constraints: - custom_constraint: nova.flavor @@ -115,7 +116,7 @@ resources: command: {get_param: ConfigCommand} properties: image: {get_param: SwiftStorageImage} - flavor: {get_param: Flavor} + flavor: {get_param: OvercloudSwiftStorageFlavor} key_name: {get_param: KeyName} networks: - network: ctlplane -- cgit 1.2.3-korg