tripleo-heat-templates/overcloud-resource-registry-puppet.yaml at 2698bb457309108dbf5821fe3976a64509c692e5 - tripleo-heat-templates - OpenDev: Free Software Needs Free Tools

openstack/tripleo-heat-templates

Dan Prince 2698bb4573 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

2015-01-27 09:07:18 -05:00

8 lines

336 B

YAML

Raw Blame History

 resource_registry:
   OS::TripleO::BlockStorage: cinder-storage.yaml
   OS::TripleO::Compute: compute-puppet.yaml
   OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
   OS::TripleO::Controller: controller-puppet.yaml
   OS::TripleO::ObjectStorage: swift-storage.yaml
   OS::TripleO::Net::SoftwareConfig: net-config-bridge.yaml