Merge "Add default for DeployIdentifier in nested templates"

[apex-tripleo-heat-templates.git] / puppet / swift-storage-post.yaml

diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml
index eb06b24..ebc54ab 100644 (file)
--- a/puppet/swift-storage-post.yaml
+++ b/puppet/swift-storage-post.yaml
@@ -8,8 +8,12 @@ parameters:
     type: boolean
   servers:
     type: json
-  NodeConfigIdentifiers:
-     type: json
+  RoleData:
+    type: json
+    default: {}
+  DeployIdentifier:
+     type: string
+     default: ''
      description: Value which changes if the node configuration may need to be re-applied
 
 resources:
@@ -23,7 +27,7 @@ resources:
       servers:  {get_param: servers}
       config: {get_resource: StorageArtifactsConfig}
       input_values:
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   StoragePuppetConfig:
     type: OS::Heat::SoftwareConfig
@@ -31,46 +35,56 @@ resources:
       group: puppet
       options:
         enable_debug: {get_param: ConfigDebug}
+        enable_hiera: True
+        enable_facter: False
+        modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules
+      inputs:
+      - name: step
       outputs:
       - name: result
       config:
-        get_file: manifests/overcloud_object.pp
+        list_join:
+        - ''
+        - - get_file: manifests/overcloud_object.pp
+          - {get_param: [RoleData, step_config]}
 
-  StorageDeployment_Step1:
+  StorageRingbuilderDeployment_Step2:
     type: OS::Heat::StructuredDeployments
     depends_on: StorageArtifactsDeploy
     properties:
-      name: StorageDeployment_Step1
+      name: StorageRingbuilderDeployment_Step2
       servers:  {get_param: servers}
       config: {get_resource: StoragePuppetConfig}
       input_values:
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        step: 2
+        update_identifier: {get_param: DeployIdentifier}
 
-  StorageRingbuilderPuppetConfig:
-    type: OS::Heat::SoftwareConfig
+  StorageRingbuilderDeployment_Step3:
+    type: OS::Heat::StructuredDeployments
+    depends_on: StorageRingbuilderDeployment_Step2
     properties:
-      group: puppet
-      options:
-        enable_debug: {get_param: ConfigDebug}
-      outputs:
-      - name: result
-      config:
-        get_file: manifests/ringbuilder.pp
+      name: StorageRingbuilderDeployment_Step3
+      servers:  {get_param: servers}
+      config: {get_resource: StoragePuppetConfig}
+      input_values:
+        step: 3
+        update_identifier: {get_param: DeployIdentifier}
 
-  StorageRingbuilderDeployment_Step2:
+  StorageDeployment_Step4:
     type: OS::Heat::StructuredDeployments
-    depends_on: StorageDeployment_Step1
+    depends_on: StorageRingbuilderDeployment_Step3
     properties:
-      name: StorageRingbuilderDeployment_Step2
+      name: StorageDeployment_Step4
       servers:  {get_param: servers}
-      config: {get_resource: StorageRingbuilderPuppetConfig}
+      config: {get_resource: StoragePuppetConfig}
       input_values:
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        step: 4
+        update_identifier: {get_param: DeployIdentifier}
 
   # Note, this should come last, so use depends_on to ensure
   # this is created after any other resources.
   ExtraConfig:
-    depends_on: StorageRingbuilderDeployment_Step2
+    depends_on: StorageDeployment_Step4
     type: OS::TripleO::NodeExtraConfigPost
     properties:
         servers: {get_param: servers}