diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-01-25 21:10:01 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-01-25 21:10:01 +0000 |
commit | e0276eada87f0d1c1c055c257dd5ba47f51bf728 (patch) | |
tree | 63348e253457ffa20a651da0ddede5e13ba8a138 /puppet/services/swift-ringbuilder.yaml | |
parent | 7dbd771a35e06bf1601e10c5d92e4b18955ce958 (diff) | |
parent | f6511ece5f6c510110205621fc292a2a03d87d4e (diff) |
Merge "Auto-set SwiftMountCheck and SwiftUseLocalDir settings"
Diffstat (limited to 'puppet/services/swift-ringbuilder.yaml')
-rw-r--r-- | puppet/services/swift-ringbuilder.yaml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/puppet/services/swift-ringbuilder.yaml b/puppet/services/swift-ringbuilder.yaml index a7ba7bad..2e3c818f 100644 --- 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 +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. @@ -59,7 +69,7 @@ outputs: 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: |