From f6511ece5f6c510110205621fc292a2a03d87d4e Mon Sep 17 00:00:00 2001 From: Christian Schwede Date: Wed, 21 Dec 2016 10:06:44 +0000 Subject: Auto-set SwiftMountCheck and SwiftUseLocalDir settings This patch automatically sets the options SwiftMountCheck and SwiftUseLocalDir depending on SwiftRawDisks. If SwiftRawDisks is set, the usage of a local directory will be automatically disabled in the ringbuilder and the mount check option will be enabled. Change-Id: If58cecc94c25603f50411ffe60ad24c104147c66 --- puppet/services/swift-storage.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'puppet/services/swift-storage.yaml') diff --git a/puppet/services/swift-storage.yaml b/puppet/services/swift-storage.yaml index 00ae9c35..88fd73aa 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': -- cgit 1.2.3-korg