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 "puppet: install Horizon on overcloud-controller"
[apex-tripleo-heat-templates.git]
/
puppet
/
swift-storage-puppet.yaml
diff --git
a/puppet/swift-storage-puppet.yaml
b/puppet/swift-storage-puppet.yaml
index
6f861d8
..
4592243
100644
(file)
--- a/
puppet/swift-storage-puppet.yaml
+++ b/
puppet/swift-storage-puppet.yaml
@@
-68,6
+68,15
@@
resources:
NodeUserData:
type: OS::TripleO::NodeUserData
NodeUserData:
type: OS::TripleO::NodeUserData
+ NetworkConfig:
+ type: OS::TripleO::ObjectStorage::Net::SoftwareConfig
+
+ NetworkDeployment:
+ type: OS::TripleO::SoftwareDeployment
+ properties:
+ config: {get_attr: [NetworkConfig, config_id]}
+ server: {get_resource: SwiftStorage}
+
SwiftStorageHieraConfig:
type: OS::Heat::StructuredConfig
properties:
SwiftStorageHieraConfig:
type: OS::Heat::StructuredConfig
properties:
@@
-127,7
+136,7
@@
outputs:
hosts_entry:
value:
str_replace:
hosts_entry:
value:
str_replace:
- template: "IP HOST
HOST.novalocal
"
+ template: "IP HOST"
params:
IP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
HOST: {get_attr: [SwiftStorage, name]}
params:
IP: {get_attr: [SwiftStorage, networks, ctlplane, 0]}
HOST: {get_attr: [SwiftStorage, name]}