diff options
| author |   Dan Prince <dprince@redhat.com> | 2015-01-14 15:54:45 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2015-01-27 09:07:18 -0500 |
| commit | 2698bb457309108dbf5821fe3976a64509c692e5 (patch) | |
| tree | 4914a57812347a4a0feb9788c87ed41a26547001 /overcloud-resource-registry.yaml | |
| parent | 7f09f73a314ac0412a4410582a143899acf0528c (diff) | |
Compute: consolidated nested stack
In I250dc1a8c02626cf7d1a5d2ce92706504ec0c7de 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 compute related stuff for
our two implementations:
compute.yaml: is used by os-apply-config (uses the
tripleo-image-elements)
compute-puppet.yaml: uses stackforge puppet-* modules for
configuration
By duplicating the entire compute 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
using the global parameters via Heat environment files instead.
Change-Id: I49175d1843520abc80fefe9528442e5dda151f5d
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 03e790d6..8a1398b6 100644 --- a/overcloud-resource-registry.yaml +++ b/overcloud-resource-registry.yaml @@ -1,7 +1,6 @@ resource_registry: OS::TripleO::BlockStorage: cinder-storage.yaml OS::TripleO::Compute: compute.yaml - OS::TripleO::Compute::SoftwareConfig: compute-config.yaml OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment OS::TripleO::Controller: controller.yaml OS::TripleO::ObjectStorage: swift-storage.yaml |