aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/swift-storage.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-09 02:45:31 +0000
committerGerrit Code Review <review@openstack.org>2016-08-09 02:45:31 +0000
commit6bba45ac28b166d69ed1aec1d3381cb56a4bc470 (patch)
treeb9d59a8e0493f56721b3f07e2201ccbf6daf65fc /puppet/swift-storage.yaml
parentdd8cb29d4e598a51fee04a4b6d8cf4a91cb82d97 (diff)
parent1c5a7c32835ca44934447b24cd6a5c542cb7b296 (diff)
Merge "Move *Flavor parameters into per-role templates"
Diffstat (limited to 'puppet/swift-storage.yaml')
-rw-r--r--puppet/swift-storage.yaml5
1 files changed, 3 insertions, 2 deletions
diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index 5e331f44..3a66bc9e 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