Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add novajoin entries to the TLS-everywhere environment file"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
swift-ringbuilder.yaml
diff --git
a/puppet/services/swift-ringbuilder.yaml
b/puppet/services/swift-ringbuilder.yaml
index
a7ba7ba
..
2e3c818
100644
(file)
--- a/
puppet/services/swift-ringbuilder.yaml
+++ b/
puppet/services/swift-ringbuilder.yaml
@@
-43,6
+43,16
@@
parameters:
description: 'Use a local directory for Swift storage services when building rings'
type: boolean
description: 'Use a local directory for Swift storage services when building rings'
type: boolean
+conditions:
+ swift_use_local_dir:
+ and:
+ - equals:
+ - get_param: SwiftUseLocalDir
+ - true
+ - equals:
+ - get_param: SwiftRawDisks
+ - {}
+
outputs:
role_data:
description: Role data for Swift Ringbuilder configuration.
outputs:
role_data:
description: Role data for Swift Ringbuilder configuration.
@@
-59,7
+69,7
@@
outputs:
expression: $.data.raw_disk_lists.flatten()
data:
raw_disk_lists:
expression: $.data.raw_disk_lists.flatten()
data:
raw_disk_lists:
- - {if: [
{get_param: SwiftUseLocalDir}
, [':%PORT%/d1'], []]}
+ - {if: [
swift_use_local_dir
, [':%PORT%/d1'], []]}
- repeat:
template: ':%PORT%/DEVICE'
for_each:
- repeat:
template: ':%PORT%/DEVICE'
for_each: