diff options
author | Dan Prince <dprince@redhat.com> | 2015-02-12 21:09:02 -0500 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2015-02-12 22:19:24 -0500 |
commit | 3f108ff4bd6a353329f5824bb478c4cb4cbb62d5 (patch) | |
tree | cc6afa1020d7ee74774d470a93c9ca74f51652f6 /overcloud-resource-registry-puppet.yaml | |
parent | d25bd1f12e6b6b74aac4fdc593492ec42518bf8d (diff) |
Split out SwiftDevicesAndProxy SoftwareConfig
This patch splits out the SwiftDevicesAndProxy config
such that alternate implementation (puppet for example)
can implement their own SoftwareConfig's via a nested stack.
This is controlled by the standard overcloud heat environment.
For os-apply-config deployments the implementation should work the
same as before.
For puppet deployments the implementation uses hiera metadata
to configure swift devices.
Partial-bug: 1418805
Change-Id: Ibf6038460f36279ad51a04947589d4a03a553f66
Diffstat (limited to 'overcloud-resource-registry-puppet.yaml')
-rw-r--r-- | overcloud-resource-registry-puppet.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 0e6f6235..ab6be35b 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -7,6 +7,7 @@ resource_registry: OS::TripleO::Net::SoftwareConfig: net-config-bridge.yaml OS::TripleO::CephStorage: puppet/ceph-storage-puppet.yaml OS::TripleO::ControllerPostDeployment: puppet/controller-post-puppet.yaml + OS::TripleO::SwiftDevicesAndProxy::SoftwareConfig: puppet/swift-devices-and-proxy-config.yaml # NOTE(dprince): requires a new release of python-heatclient #default_parameters: |