Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Move *Flavor parameters into per-role templates"
[apex-tripleo-heat-templates.git]
/
puppet
/
swift-storage.yaml
diff --git
a/puppet/swift-storage.yaml
b/puppet/swift-storage.yaml
index
5e331f4
..
3a66bc9
100644
(file)
--- 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:
heat_template_version: 2015-04-30
description: 'OpenStack swift storage node configured by Puppet'
parameters:
- Flavor:
+
OvercloudSwiftStorage
Flavor:
description: Flavor for Swift storage nodes to request when deploying.
description: Flavor for Swift storage nodes to request when deploying.
+ default: baremetal
type: string
constraints:
- custom_constraint: nova.flavor
type: string
constraints:
- custom_constraint: nova.flavor
@@
-115,7
+116,7
@@
resources:
command: {get_param: ConfigCommand}
properties:
image: {get_param: SwiftStorageImage}
command: {get_param: ConfigCommand}
properties:
image: {get_param: SwiftStorageImage}
- flavor: {get_param: Flavor}
+ flavor: {get_param:
OvercloudSwiftStorage
Flavor}
key_name: {get_param: KeyName}
networks:
- network: ctlplane
key_name: {get_param: KeyName}
networks:
- network: ctlplane