diff options
| author |   Dan Prince <dprince@redhat.com> | 2015-01-14 14:58:35 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2015-01-27 09:04:37 -0500 |
| commit | 7f09f73a314ac0412a4410582a143899acf0528c (patch) | |
| tree | 07755f7322cb5f905b1ccd60a7181a8afca9d279 /overcloud-resource-registry.yaml | |
| parent | c0328095f17796fb1b87a1da355f40dda10c06fe (diff) | |
Controller: consolidated nested stack
In I228216a0b55ff2d384b281d9ad2a61b93d58dab9 we split
out just the Controller software config in an effort
to provide hooks for alternate implementations (puppet).
This sort of worked but caused quirky ordering issues
with signal handling. It also causes problems for Tuskar
which would prefer to think of these nested stacks and
not have us split out just the software configs like this.
This patch moves all the controller related stuff for
our two implementations:
controller.yaml: is used by os-apply-config (uses the
tripleo-image-elements)
controller-puppet.yaml: uses stackforge puppet-* modules for
configuration
By duplicating the entire controller in this manner we make
it much easier to create dependencies and implement proper
signal handling. The only (temporary) downside is the duplication
of parameters most of which will eventually go away when we move towards
using the global parameters via Heat environment files instead.
Change-Id: Iaf3c889d7c8815f862308cd8e15ce1010059f5c6
Diffstat (limited to 'overcloud-resource-registry.yaml')
| -rw-r--r-- | overcloud-resource-registry.yaml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/overcloud-resource-registry.yaml b/overcloud-resource-registry.yaml index 249dee9b..03e790d6 100644 --- a/overcloud-resource-registry.yaml +++ b/overcloud-resource-registry.yaml @@ -4,6 +4,5 @@ resource_registry: OS::TripleO::Compute::SoftwareConfig: compute-config.yaml OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment OS::TripleO::Controller: controller.yaml - OS::TripleO::Controller::SoftwareConfig: controller-config.yaml OS::TripleO::ObjectStorage: swift-storage.yaml OS::TripleO::Net::SoftwareConfig: net-config-noop.yaml |