From: Steven Hardy <shardy@redhat.com>
Date: Wed, 18 May 2016 15:38:34 +0000 (+0100)
Subject: Add step to ObjectStorage RingBuilder deployment
X-Git-Tag: opnfv-6.0.0~1999^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=22c44a9fe574e829d69b67dd9de38a377159fa6d;p=apex-tripleo-heat-templates.git

Add step to ObjectStorage RingBuilder deployment

https://review.openstack.org/#/c/236243 added a new conditional
for the controller steps, but we don't pass any step for the
ObjectStorage nodes, so the deployment fails.  This passes a
step that enables the ringbuilder again, although it does end
up inconsistent with the deployment Step name.

Change-Id: I506961f4a22dba9960d819d7376a39e7ccbcdece
Closes-Bug: #1583225
---

diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml
index eb06b241..b262f947 100644
--- a/puppet/swift-storage-post.yaml
+++ b/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