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
Add missing createUser line to /etc/snmp/snmpd.conf
[apex-tripleo-heat-templates.git]
/
puppet
/
swift-storage-post.yaml
diff --git
a/puppet/swift-storage-post.yaml
b/puppet/swift-storage-post.yaml
index
3e01fe7
..
d22f538
100644
(file)
--- a/
puppet/swift-storage-post.yaml
+++ b/
puppet/swift-storage-post.yaml
@@
-1,9
+1,17
@@
-heat_template_version: 201
4-10-16
+heat_template_version: 201
5-04-30
description: 'OpenStack swift storage node post deployment for Puppet'
parameters:
description: 'OpenStack swift storage node post deployment for Puppet'
parameters:
+ ConfigDebug:
+ default: false
+ description: Whether to run config management (e.g. Puppet) in debug mode.
+ type: boolean
servers:
type: json
servers:
type: json
+ NodeConfigIdentifiers:
+ type: json
+ description: Value which changes if the node configuration may need to be re-applied
+
resources:
resources:
@@
-11,6
+19,8
@@
resources:
type: OS::Heat::SoftwareConfig
properties:
group: puppet
type: OS::Heat::SoftwareConfig
properties:
group: puppet
+ options:
+ enable_debug: {get_param: ConfigDebug}
outputs:
- name: result
config:
outputs:
- name: result
config:
@@
-21,11
+31,15
@@
resources:
properties:
servers: {get_param: servers}
config: {get_resource: StoragePuppetConfig}
properties:
servers: {get_param: servers}
config: {get_resource: StoragePuppetConfig}
+ input_values:
+ update_identifier: {get_param: NodeConfigIdentifiers}
StorageRingbuilderPuppetConfig:
type: OS::Heat::SoftwareConfig
properties:
group: puppet
StorageRingbuilderPuppetConfig:
type: OS::Heat::SoftwareConfig
properties:
group: puppet
+ options:
+ enable_debug: {get_param: ConfigDebug}
outputs:
- name: result
config:
outputs:
- name: result
config:
@@
-37,6
+51,8
@@
resources:
properties:
servers: {get_param: servers}
config: {get_resource: StorageRingbuilderPuppetConfig}
properties:
servers: {get_param: servers}
config: {get_resource: StorageRingbuilderPuppetConfig}
+ input_values:
+ update_identifier: {get_param: NodeConfigIdentifiers}
# Note, this should come last, so use depends_on to ensure
# this is created after any other resources.
# Note, this should come last, so use depends_on to ensure
# this is created after any other resources.