summaryrefslogtreecommitdiffstats
path: root/puppet/compute-post-puppet.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-02-19 15:54:24 -0800
committerDan Prince <dprince@redhat.com>2015-02-23 20:45:01 -0500
commitb11ac7e6b67c08eb7407872ece519f2675151483 (patch)
treee9671adf67ea1f6fa326400a435a3ad3b977b47e /puppet/compute-post-puppet.yaml
parent62ab434139c4576afe84b7b0b08374261fc79563 (diff)
Compute: Exec puppet after all configuration
This patch adds a new ComputeNodesPostDeployment resource which can be used along with the environment file to specify a nested stack which is guaranteed to execute after all the Compute config deployments 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 allNodes data 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. Change-Id: I80bccd692e45393f8250607073d1fe7beb0d7396
Diffstat (limited to 'puppet/compute-post-puppet.yaml')
-rw-r--r--puppet/compute-post-puppet.yaml25
1 files changed, 25 insertions, 0 deletions
diff --git a/puppet/compute-post-puppet.yaml b/puppet/compute-post-puppet.yaml
new file mode 100644
index 00000000..9b7eb0cf
--- /dev/null
+++ b/puppet/compute-post-puppet.yaml
@@ -0,0 +1,25 @@
+heat_template_version: 2014-10-16
+
+description: >
+ OpenStack compute node post deployment for Puppet.
+
+parameters:
+ servers:
+ type: json
+
+resources:
+
+ ComputePuppetConfig:
+ type: OS::Heat::SoftwareConfig
+ properties:
+ group: puppet
+ outputs:
+ - name: result
+ config:
+ get_file: manifests/overcloud_compute.pp
+
+ ComputePuppetDeployment:
+ type: OS::Heat::StructuredDeployments
+ properties:
+ servers: {get_param: servers}
+ config: {get_resource: ComputePuppetConfig}