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-storage.yaml | |
| parent | 7dbd771a35e06bf1601e10c5d92e4b18955ce958 (diff) | |
| parent | f6511ece5f6c510110205621fc292a2a03d87d4e (diff) | |
Merge "Auto-set SwiftMountCheck and SwiftUseLocalDir settings"
Diffstat (limited to 'puppet/services/swift-storage.yaml')
| -rw-r--r-- | puppet/services/swift-storage.yaml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/puppet/services/swift-storage.yaml b/puppet/services/swift-storage.yaml index 08df928d..247b23ff 100644 --- a/puppet/services/swift-storage.yaml +++ b/puppet/services/swift-storage.yaml @@ -56,6 +56,17 @@ resources: DefaultPasswords: {get_param: DefaultPasswords} EndpointMap: {get_param: EndpointMap} +conditions: + swift_mount_check: + or: + - equals: + - get_param: SwiftMountCheck + - true + - not: + equals: + - get_param: SwiftRawDisks + - {} + outputs: role_data: description: Role data for the Swift Proxy role. @@ -65,7 +76,7 @@ outputs: config_settings: map_merge: - get_attr: [SwiftBase, role_data, config_settings] - - swift::storage::all::mount_check: {get_param: SwiftMountCheck} + - swift::storage::all::mount_check: {if: [swift_mount_check, true, false]} tripleo::profile::base::swift::storage::enable_swift_storage: {get_param: ControllerEnableSwiftStorage} tripleo.swift_storage.firewall_rules: '123 swift storage': |