diff options
Diffstat (limited to 'puppet')
-rw-r--r-- | puppet/swift-storage-post.yaml | 42 | ||||
-rw-r--r-- | puppet/swift-storage-puppet.yaml | 32 |
2 files changed, 42 insertions, 32 deletions
diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml new file mode 100644 index 00000000..89cf9733 --- /dev/null +++ b/puppet/swift-storage-post.yaml @@ -0,0 +1,42 @@ +heat_template_version: 2014-10-16 +description: 'Swift Storage Post Deployment' +# NOTE: this is a noop for os-apply-config style deployments because +# post deployment ordering is controlled by tripleo-image-elements + +parameters: + servers: + type: json + +resources: + + StoragePuppetConfig: + type: OS::Heat::SoftwareConfig + properties: + group: puppet + outputs: + - name: result + config: + get_file: manifests/overcloud_object.pp + + StoragePuppetDeployment: + type: OS::Heat::StructuredDeployments + properties: + name: puppet_1 + servers: {get_param: servers} + config: {get_resource: StoragePuppetConfig} + + StorageRingbuilderPuppetConfig: + type: OS::Heat::SoftwareConfig + properties: + group: puppet + outputs: + - name: result + config: + get_file: manifests/ringbuilder.pp + + StorageRingbuilderPuppetDeployment: + type: OS::Heat::StructuredDeployments + properties: + name: puppet_2 + servers: {get_param: servers} + config: {get_resource: StorageRingbuilderPuppetConfig} diff --git a/puppet/swift-storage-puppet.yaml b/puppet/swift-storage-puppet.yaml index 7a831a58..9caa8485 100644 --- a/puppet/swift-storage-puppet.yaml +++ b/puppet/swift-storage-puppet.yaml @@ -64,38 +64,6 @@ resources: networks: - network: ctlplane - StoragePuppetConfig: - type: OS::Heat::SoftwareConfig - properties: - group: puppet - outputs: - - name: result - config: - get_file: manifests/overcloud_object.pp - - StoragePuppetDeployment: - type: OS::Heat::StructuredDeployment - properties: - name: puppet_1 - server: {get_resource: SwiftStorage} - config: {get_resource: StoragePuppetConfig} - - StorageRingbuilderPuppetConfig: - type: OS::Heat::SoftwareConfig - properties: - group: puppet - outputs: - - name: result - config: - get_file: manifests/ringbuilder.pp - - StorageRingbuilderPuppetDeployment: - type: OS::Heat::StructuredDeployment - properties: - name: puppet_2 - server: {get_resource: SwiftStorage} - config: {get_resource: StorageRingbuilderPuppetConfig} - SwiftStorageHieraConfig: type: OS::Heat::StructuredConfig properties: |