diff options
author | 2015-01-09 22:35:50 +0000 | |
---|---|---|
committer | 2015-01-09 22:35:50 +0000 | |
commit | 00c3a6c3b9499ca8eb0f1087863638f858540e5c (patch) | |
tree | e4f7b6c68a09c97a5e04a4a859963cca955653fe | |
parent | 5409182d65439fe81dfac0fb4c4703312333735e (diff) | |
parent | 0f39c7773b9899c503ede9177090819749efebf0 (diff) |
Merge "Add SwiftMountCheck to overcloud-without-mergepy"
-rw-r--r-- | controller.yaml | 6 | ||||
-rw-r--r-- | overcloud-without-mergepy.yaml | 6 | ||||
-rw-r--r-- | swift-storage.yaml | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/controller.yaml b/controller.yaml index 214ffbb6..3d767c50 100644 --- a/controller.yaml +++ b/controller.yaml @@ -344,6 +344,10 @@ parameters: in the ring. hidden: true type: string + SwiftMountCheck: + default: 'false' + description: Value of mount_check in Swift account/container/object -server.conf + type: boolean SwiftMinPartHours: type: number default: 1 @@ -623,6 +627,7 @@ resources: swift: hash: { get_input: swift_hash_suffix } part-power: { get_input: swift_part_power } + mount-check: { get_input: swift_mount_check } min-part-hours: { get_input: swift_min_part_hours } replicas: {get_input: swift_replicas } service-password: { get_input: swift_password } @@ -635,6 +640,7 @@ resources: signal_transport: NO_SIGNAL input_values: swift_hash_suffix: {get_param: SwiftHashSuffix} + swift_mount_check: {get_param: SwiftMountCheck} swift_password: {get_param: SwiftPassword} swift_min_part_hours: {get_param: SwiftMinPartHours} swift_part_power: {get_param: SwiftPartPower} diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 45cedc57..9ff0dc1d 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -370,6 +370,10 @@ parameters: description: The password for the swift service account, used by the swift proxy services. type: string hidden: true + SwiftMountCheck: + default: 'false' + description: Value of mount_check in Swift account/container/object -server.conf + type: boolean SwiftMinPartHours: type: number default: 1 @@ -529,6 +533,7 @@ resources: SSLKey: {get_param: SSLKey} SSLCACertificate: {get_param: SSLCACertificate} SwiftHashSuffix: {get_param: SwiftHashSuffix} + SwiftMountCheck: {get_param: SwiftMountCheck} SwiftMinPartHours: {get_param: SwiftMinPartHours} SwiftPartPower: {get_param: SwiftPartPower} SwiftPassword: {get_param: SwiftPassword} @@ -616,6 +621,7 @@ resources: NeutronNetworkType: {get_param: NeutronNetworkType} Flavor: {get_param: OvercloudSwiftStorageFlavor} HashSuffix: {get_param: SwiftHashSuffix} + MountCheck: {get_param: SwiftMountCheck} MinPartHours: {get_param: SwiftMinPartHours} PartPower: {get_param: SwiftPartPower} Password: {get_param: SwiftPassword} diff --git a/swift-storage.yaml b/swift-storage.yaml index 7522083f..38359ffe 100644 --- a/swift-storage.yaml +++ b/swift-storage.yaml @@ -112,6 +112,7 @@ resources: hash: { get_input: swift_hash_suffix } part-power: { get_input: swift_part_power } min-part-hours: { get_input: swift_min_part_hours } + mount-check: { get_input: swift_mount_check } replicas: {get_input: swift_replicas } service-password: { get_input: swift_password } neutron: |