aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-02-12 15:49:00 -0500
committerDan Prince <dprince@redhat.com>2015-02-12 22:19:22 -0500
commitd25bd1f12e6b6b74aac4fdc593492ec42518bf8d (patch)
treeea63f73a9ee3bc1187828ad80659265b5ef354d6 /overcloud-resource-registry.yaml
parent6b5ac01d2e61af9efddd01b58bfc0f6cd1e8518f (diff)
Controller: Exec puppet after all configuration
This patch adds a new ControllerNodesPostDeployment resource which can be used along with the environment file to specify a nested stack which is guaranteed to execute after all the Controller config (HA, or other) have executed. This is really useful for Puppet in that Heat actually controls where puppet executes in the deployment process and we want to ensure puppet runs after all hiera configuration data has be deployed to the nodes. With the previous approach some of the data would be there, but most of the HA data which actually gets composed outside of the controller-puppet.yaml nested stack would not be guaranteed to be there in time. As os-apply-config (tripleo-image-elements) have their ordering controlled within the elements themselves an empty stubbed in nested stack has been added so that we don't break that implementation. Partial-bug: 1418805 Change-Id: Icd6b2c9c1f9b057c28649ee3bdce0039f3fd8422
Diffstat (limited to 'overcloud-resource-registry.yaml')
-rw-r--r--overcloud-resource-registry.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/overcloud-resource-registry.yaml b/overcloud-resource-registry.yaml
index 2b2c357c..ebc2b8b0 100644
--- a/overcloud-resource-registry.yaml
+++ b/overcloud-resource-registry.yaml
@@ -6,3 +6,4 @@ resource_registry:
OS::TripleO::ObjectStorage: swift-storage.yaml
OS::TripleO::Net::SoftwareConfig: net-config-noop.yaml
OS::TripleO::CephStorage: ceph-storage.yaml
+ OS::TripleO::ControllerPostDeployment: controller-post.yaml