X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fcinder-storage-post.yaml;h=9b7c752ab0dae3350bdf4b149ccf3c863afa3c8f;hb=4b4415620f9089deeabf18662a45dd305732f08d;hp=28e87800e7e5968e93b1c4694bf25bd860e06d5f;hpb=558cd7d09ce0604dd744a3fd2166ce361ad90cc2;p=apex-tripleo-heat-templates.git

diff --git a/puppet/cinder-storage-post.yaml b/puppet/cinder-storage-post.yaml
index 28e87800..9b7c752a 100644
--- a/puppet/cinder-storage-post.yaml
+++ b/puppet/cinder-storage-post.yaml
@@ -1,11 +1,16 @@
-heat_template_version: 2014-10-16
-description: 'Common Block Storage Post Deployment'
-# NOTE: this is a noop for os-apply-config style deployments because
-# post deployment ordering is controlled by tripleo-image-elements
+heat_template_version: 2015-04-30
+description: 'OpenStack cinder storage post deployment for Puppet'
 
 parameters:
+  ConfigDebug:
+    default: false
+    description: Whether to run config management (e.g. Puppet) in debug mode.
+    type: boolean
   servers:
     type: json
+  NodeConfigIdentifiers:
+     type: json
+     description: Value which changes if the node configuration may need to be re-applied
 
 resources:
 
@@ -13,6 +18,8 @@ resources:
     type: OS::Heat::SoftwareConfig
     properties:
       group: puppet
+      options:
+        enable_debug: {get_param: ConfigDebug}
       outputs:
       - name: result
       config:
@@ -21,5 +28,14 @@ resources:
   VolumeDeployment_Step1:
     type: OS::Heat::StructuredDeployments
     properties:
+      name: VolumeDeployment_Step1
       servers:  {get_param: servers}
       config: {get_resource: VolumePuppetConfig}
+
+  # Note, this should come last, so use depends_on to ensure
+  # this is created after any other resources.
+  ExtraConfig:
+    depends_on: VolumeDeployment_Step1
+    type: OS::TripleO::NodeExtraConfigPost
+    properties:
+        servers: {get_param: servers}