summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-04 13:24:39 +0000
committerGerrit Code Review <review@openstack.org>2016-11-04 13:24:39 +0000
commit08dfb236329e3adabafacffd30683f7609b5b615 (patch)
tree51e943aaba6d377a62b1b6dc53701113eef73ee2
parent2df74cc8295bcc96add61d559068153056ba3e5d (diff)
parent813b3dc4fc94745719afce7192ac24b153d1dbd8 (diff)
Merge "Add option to disable "d1" Swift device"
-rw-r--r--puppet/services/swift-ringbuilder.yaml7
1 files changed, 5 insertions, 2 deletions
diff --git a/puppet/services/swift-ringbuilder.yaml b/puppet/services/swift-ringbuilder.yaml
index 8ed4e9f4..5c70b6ab 100644
--- a/puppet/services/swift-ringbuilder.yaml
+++ b/puppet/services/swift-ringbuilder.yaml
@@ -38,7 +38,10 @@ parameters:
default: {}
description: 'A hash of additional raw devices to use as Swift backend (eg. {sdb: {}})'
type: json
-
+ SwiftUseLocalDir:
+ default: true
+ description: 'Use a local directory for Swift storage services when building rings'
+ type: boolean
outputs:
role_data:
@@ -56,7 +59,7 @@ outputs:
expression: $.data.raw_disk_lists.flatten()
data:
raw_disk_lists:
- - [':%PORT%/d1']
+ - {if: [{get_param: SwiftUseLocalDir}, [':%PORT%/d1'], []]}
- repeat:
template: ':%PORT%/DEVICE'
for_each: