aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-18 19:27:40 +0000
committerGerrit Code Review <review@openstack.org>2016-05-18 19:27:41 +0000
commite7dc872373974c8f8976c6ef1923b37f1ba4639b (patch)
treed4d70e746eaf2a967bc91bbe98079ca901819520 /puppet
parent168bc2f6ff7310db6dc4cf957fdbb121419a3fcf (diff)
parent22c44a9fe574e829d69b67dd9de38a377159fa6d (diff)
Merge "Add step to ObjectStorage RingBuilder deployment"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/swift-storage-post.yaml5
1 files changed, 5 insertions, 0 deletions
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