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
Include new apache pacemaker profile
[apex-tripleo-heat-templates.git]
/
puppet
/
swift-storage.yaml
diff --git
a/puppet/swift-storage.yaml
b/puppet/swift-storage.yaml
index
e663fb6
..
9d049bd
100644
(file)
--- a/
puppet/swift-storage.yaml
+++ b/
puppet/swift-storage.yaml
@@
-112,11
+112,18
@@
parameters:
ServiceConfigSettings:
type: json
default: {}
ServiceConfigSettings:
type: json
default: {}
+ ConfigCommand:
+ type: string
+ description: Command which will be run whenever configuration data changes
+ default: os-refresh-config --timeout 14400
resources:
SwiftStorage:
type: OS::Nova::Server
resources:
SwiftStorage:
type: OS::Nova::Server
+ metadata:
+ os-collect-config:
+ command: {get_param: ConfigCommand}
properties:
image: {get_param: Image}
flavor: {get_param: Flavor}
properties:
image: {get_param: Image}
flavor: {get_param: Flavor}
@@
-333,6
+340,12
@@
resources:
get_param: UpdateIdentifier
outputs:
get_param: UpdateIdentifier
outputs:
+ ip_address:
+ description: IP address of the server in the ctlplane network
+ value: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
+ hostname:
+ description: Hostname of the server
+ value: {get_attr: [SwiftStorage, name]}
hosts_entry:
value:
str_replace:
hosts_entry:
value:
str_replace: