summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorChristian Schwede <cschwede@redhat.com>2016-10-27 16:54:35 +0200
committerChristian Schwede <cschwede@redhat.com>2016-10-28 08:49:51 +0200
commit813b3dc4fc94745719afce7192ac24b153d1dbd8 (patch)
tree86fd2d66ad34af7e6c036935c6c36778d317636a /puppet
parente60c5377fb4b6dd96a8415b03e88005b3eab603c (diff)
Add option to disable "d1" Swift device
A default TripleO installation uses a local directory named "d1" to be used by Swift. With SwiftRawDisks set it is highly unlikely that that an operator wants to use this any longer, because it affects system perforamce and might result in an overfilled the system disk. In this case d1 should be no longer when building rings. This patch makes it possible to disable the d1 device usage in the ring building process by using a new option "SwiftUseLocalDir". This is set by default to true, not changing the default behavior. If set to false, the d1 device won't be used when building rings. Closes-Bug: 1634051 Change-Id: Ia9ad38e3ffa533e170f4cedd0518d830e9b2fa69
Diffstat (limited to 'puppet')
-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: