openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Add SwiftMinPartHours to overcloud-without-mergepy 

This was added in Icc5e431a7e2884b3ca3a255b6fd901619bc98460
and is missing from overcloud-without-mergepy.

Change-Id: I1273b646c04783712fd3f8baccafead11817689c
This commit is contained in:
Dan Prince 2015-01-09 09:43:42 -05:00
parent 9cf11371ac
commit a471fee05a
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
controller.yaml
View File

@ -344,6 +344,10 @@ parameters:
in the ring.
hidden: true
type: string
SwiftMinPartHours:
type: number
default: 1
description: The minimum time (in hours) before a partition in a ring can be moved following a rebalance.
SwiftPartPower:
default: 10
description: Partition Power to use when building Swift rings
@ -619,6 +623,7 @@ resources:
swift:
hash: { get_input: swift_hash_suffix }
part-power: { get_input: swift_part_power }
min-part-hours: { get_input: swift_min_part_hours }
replicas: {get_input: swift_replicas }
service-password: { get_input: swift_password }
@ -631,6 +636,7 @@ resources:
input_values:
swift_hash_suffix: {get_param: SwiftHashSuffix}
swift_password: {get_param: SwiftPassword}
swift_min_part_hours: {get_param: SwiftMinPartHours}
swift_part_power: {get_param: SwiftPartPower}
swift_replicas: { get_param: SwiftReplicas}

6
overcloud-without-mergepy.yaml
View File

@ -370,6 +370,10 @@ parameters:
description: The password for the swift service account, used by the swift proxy services.
type: string
hidden: true
SwiftMinPartHours:
type: number
default: 1
description: The minimum time (in hours) before a partition in a ring can be moved following a rebalance.
SwiftPartPower:
default: 10
description: Partition Power to use when building Swift rings
@ -525,6 +529,7 @@ resources:
SSLKey: {get_param: SSLKey}
SSLCACertificate: {get_param: SSLCACertificate}
SwiftHashSuffix: {get_param: SwiftHashSuffix}
SwiftMinPartHours: {get_param: SwiftMinPartHours}
SwiftPartPower: {get_param: SwiftPartPower}
SwiftPassword: {get_param: SwiftPassword}
SwiftReplicas: { get_param: SwiftReplicas}
@ -611,6 +616,7 @@ resources:
NeutronNetworkType: {get_param: NeutronNetworkType}
Flavor: {get_param: OvercloudSwiftStorageFlavor}
HashSuffix: {get_param: SwiftHashSuffix}
MinPartHours: {get_param: SwiftMinPartHours}
PartPower: {get_param: SwiftPartPower}
Password: {get_param: SwiftPassword}
Image: {get_param: SwiftStorageImage}

6
swift-storage.yaml
View File

@ -70,6 +70,10 @@ parameters:
NeutronNetworkType:
default: gre
type: string
MinPartHours:
type: number
default: 1
description: The minimum time (in hours) before a partition in a ring can be moved following a rebalance.
PartPower:
default: 10
description: Partition Power to use when building Swift rings
@ -107,6 +111,7 @@ resources:
swift:
hash: { get_input: swift_hash_suffix }
part-power: { get_input: swift_part_power }
min-part-hours: { get_input: swift_min_part_hours }
replicas: {get_input: swift_replicas }
service-password: { get_input: swift_password }
neutron:
@ -150,6 +155,7 @@ resources:
swift_hash_suffix: {get_param: HashSuffix}
swift_mount_check: {get_param: MountCheck}
swift_password: {get_param: Password}
swift_min_part_hours: {get_param: MinPartHours}
swift_part_power: {get_param: PartPower}
swift_replicas: { get_param: Replicas}