summaryrefslogtreecommitdiffstats
path: root/puppet/cinder-storage-puppet.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-02-23 14:00:24 -0500
committerDan Prince <dprince@redhat.com>2015-02-23 20:45:03 -0500
commit3ced063b490cb05bf2332e85358c795e367491ce (patch)
tree63d82348a4204553744a72bfbcb11da665695647 /puppet/cinder-storage-puppet.yaml
parent66aaf72d35fc7c9be5d4fc7605f8ad6d7b5c520e (diff)
BlockStore: Exec puppet after all configuration
This patch adds a new BlockStoreNodesPostDeployment resource which can be used along with the environment file to specify a nested stack which is guaranteed to execute after all the BlockStore 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: I29b3574e341eecd53b2867788f415bff153cfa9f
Diffstat (limited to 'puppet/cinder-storage-puppet.yaml')
-rw-r--r--puppet/cinder-storage-puppet.yaml16
1 files changed, 0 insertions, 16 deletions
diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage-puppet.yaml
index befd8e4e..6ad4d348 100644
--- a/puppet/cinder-storage-puppet.yaml
+++ b/puppet/cinder-storage-puppet.yaml
@@ -160,22 +160,6 @@ resources:
ntp::servers: {get_input: ntp_servers}
enable_package_install: {get_input: enable_package_install}
- VolumePuppetConfig:
- type: OS::Heat::SoftwareConfig
- properties:
- group: puppet
- outputs:
- - name: result
- config:
- get_file: manifests/overcloud_volume.pp
-
- VolumePuppetDeployment:
- type: OS::Heat::StructuredDeployment
- properties:
- name: puppet_1
- server: {get_resource: BlockStorage}
- config: {get_resource: VolumePuppetConfig}
-
outputs:
hosts_entry:
value: