Merge "Add step to ObjectStorage RingBuilder deployment"

puppet/swift-storage-post.yaml

@@ -52,6 +52,10 @@ resources:
       group: puppet
       options:
         enable_debug: {get_param: ConfigDebug}
+        enable_hiera: True
+        enable_facter: False
+      inputs:
+      - name: step
       outputs:
       - name: result
       config:
@@ -65,6 +69,7 @@ resources:
       servers:  {get_param: servers}
       config: {get_resource: StorageRingbuilderPuppetConfig}
       input_values:
+        step: 3 # Note ringbuilder.pp expects >=3
         update_identifier: {get_param: NodeConfigIdentifiers}
 
   # Note, this should come last, so use depends_on to ensure