X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fswift-storage-post.yaml;h=b873d923f522ddbc491519f3e33cd67a85e2fe01;hb=301560b35aae7b8861e519c705f131ead53bb7f0;hp=eb06b2417b48d92444943d167ee752c713fda2c6;hpb=fe0b757bd454f26dd2f2a3423ba5a684899bae61;p=apex-tripleo-heat-templates.git

diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml
index eb06b241..b873d923 100644
--- a/puppet/swift-storage-post.yaml
+++ b/puppet/swift-storage-post.yaml
@@ -9,8 +9,11 @@ parameters:
   servers:
     type: json
   NodeConfigIdentifiers:
-     type: json
-     description: Value which changes if the node configuration may need to be re-applied
+    type: json
+    description: Value which changes if the node configuration may need to be re-applied
+  RoleData:
+    type: json
+    default: {}
 
 resources:
 
@@ -31,46 +34,56 @@ resources:
       group: puppet
       options:
         enable_debug: {get_param: ConfigDebug}
+        enable_hiera: True
+        enable_facter: False
+      inputs:
+      - name: step
       outputs:
       - name: result
       config:
-        get_file: manifests/overcloud_object.pp
+        list_join:
+        - ''
+        - - get_file: manifests/overcloud_object.pp
+          - get_file: manifests/ringbuilder.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:
+        step: 2
         update_identifier: {get_param: NodeConfigIdentifiers}
 
-  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: NodeConfigIdentifiers}
 
-  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:
+        step: 4
         update_identifier: {get_param: NodeConfigIdentifiers}
 
   # 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}