X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fswift-storage-post.yaml;h=a55b39592e1f33e62cd54110e22fbff30f43e93a;hb=e6bd566be9df25fa2fa99ba8388dcc92b2bc017a;hp=3e01fe772253b1a165530c5dd0ea18e9832d250b;hpb=ad0f3a3e44adad1bd8aaaa580197e3c68f327388;p=apex-tripleo-heat-templates.git

diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml
index 3e01fe77..a55b3959 100644
--- a/puppet/swift-storage-post.yaml
+++ b/puppet/swift-storage-post.yaml
@@ -1,9 +1,17 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'OpenStack swift storage node 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:
 
@@ -11,6 +19,8 @@ resources:
     type: OS::Heat::SoftwareConfig
     properties:
       group: puppet
+      options:
+        enable_debug: {get_param: ConfigDebug}
       outputs:
       - name: result
       config:
@@ -19,13 +29,18 @@ resources:
   StorageDeployment_Step1:
     type: OS::Heat::StructuredDeployments
     properties:
+      name: StorageDeployment_Step1
       servers:  {get_param: servers}
       config: {get_resource: StoragePuppetConfig}
+      input_values:
+        update_identifier: {get_param: NodeConfigIdentifiers}
 
   StorageRingbuilderPuppetConfig:
     type: OS::Heat::SoftwareConfig
     properties:
       group: puppet
+      options:
+        enable_debug: {get_param: ConfigDebug}
       outputs:
       - name: result
       config:
@@ -35,8 +50,11 @@ resources:
     type: OS::Heat::StructuredDeployments
     depends_on: StorageDeployment_Step1
     properties:
+      name: StorageRingbuilderDeployment_Step2
       servers:  {get_param: servers}
       config: {get_resource: StorageRingbuilderPuppetConfig}
+      input_values:
+        update_identifier: {get_param: NodeConfigIdentifiers}
 
   # Note, this should come last, so use depends_on to ensure
   # this is created after any other resources.