diff options
Diffstat (limited to 'puppet/swift-storage-puppet.yaml')
| -rw-r--r-- | puppet/swift-storage-puppet.yaml | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/puppet/swift-storage-puppet.yaml b/puppet/swift-storage-puppet.yaml index 6d446b00..45922436 100644 --- a/puppet/swift-storage-puppet.yaml +++ b/puppet/swift-storage-puppet.yaml @@ -1,5 +1,5 @@ heat_template_version: 2014-10-16 -description: 'Common Swift Storage Configuration' +description: 'OpenStack swift storage node configured by Puppet' parameters: Flavor: description: Flavor for Swift storage nodes to request when deploying. @@ -60,9 +60,22 @@ resources: image: {get_param: Image} flavor: {get_param: Flavor} key_name: {get_param: KeyName} - user_data_format: SOFTWARE_CONFIG networks: - network: ctlplane + user_data_format: SOFTWARE_CONFIG + user_data: {get_resource: 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 @@ -123,7 +136,7 @@ outputs: 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]} |