X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fcinder-storage-post.yaml;h=f470203f76c4c93bc7e1dc49dfb3b12513ddd6b8;hb=1fa4c02fc310163da351bacbf19f2d52b46e50b3;hp=960cc5b3aa0b3c9eee4b514876ab830a7726bc2a;hpb=648b62d898bcc87d50c3f510e6706cf37499b2e3;p=apex-tripleo-heat-templates.git

diff --git a/puppet/cinder-storage-post.yaml b/puppet/cinder-storage-post.yaml
index 960cc5b3..f470203f 100644
--- a/puppet/cinder-storage-post.yaml
+++ b/puppet/cinder-storage-post.yaml
@@ -1,26 +1,53 @@
-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:
 
+  VolumeArtifactsConfig:
+    type: deploy-artifacts.yaml
+
+  VolumeArtifactsDeploy:
+    type: OS::Heat::StructuredDeployments
+    properties:
+      servers:  {get_param: servers}
+      config: {get_resource: VolumeArtifactsConfig}
+      input_values:
+        update_identifier: {get_param: NodeConfigIdentifiers}
+
   VolumePuppetConfig:
     type: OS::Heat::SoftwareConfig
+    depends_on: VolumeArtifactsDeploy
     properties:
       group: puppet
+      options:
+        enable_debug: {get_param: ConfigDebug}
       outputs:
       - name: result
       config:
         get_file: manifests/overcloud_volume.pp
 
-  VolumePuppetDeployment:
+  VolumeDeployment_Step1:
     type: OS::Heat::StructuredDeployments
     properties:
-      name: puppet_1
+      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}