diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-21 17:43:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-21 17:43:42 +0000 |
| commit | 4fd680c634f14cecb9d067e96703cc1bcdb288fa (patch) | |
| tree | fec2dd612b83d73bba0e33f5818631db55ba65c1 /puppet/controller.yaml | |
| parent | 60fb98f274a0fdcef6c24bf98a8e36ea8ab4ea5f (diff) | |
| parent | 83b8bb7bfa420a3f2d03821bf0280f9fb55f1c18 (diff) | |
Merge "Allow option to disable Swift ring management"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 28aac934..bdb124c6 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -663,6 +663,10 @@ parameters: default: 10 description: Partition Power to use when building Swift rings type: number + SwiftRingBuild: + default: true + description: Whether to manage Swift rings or not + type: boolean SwiftPassword: description: The password for the swift service account, used by the swift proxy services. @@ -1213,6 +1217,7 @@ resources: swift_hash_suffix: {get_param: SwiftHashSuffix} swift_password: {get_param: SwiftPassword} swift_part_power: {get_param: SwiftPartPower} + swift_ring_build: {get_param: SwiftRingBuild} swift_replicas: {get_param: SwiftReplicas} swift_min_part_hours: {get_param: SwiftMinPartHours} swift_mount_check: {get_param: SwiftMountCheck} @@ -1327,15 +1332,12 @@ resources: swift::swift_hash_suffix: {get_input: swift_hash_suffix} swift::proxy::authtoken::admin_password: {get_input: swift_password} swift::proxy::workers: {get_input: swift_workers} + tripleo::ringbuilder::build_ring: { get_input: swift_ring_build } tripleo::ringbuilder::part_power: {get_input: swift_part_power} tripleo::ringbuilder::replicas: {get_input: swift_replicas} tripleo::ringbuilder::min_part_hours: {get_input: swift_min_part_hours} swift_mount_check: {get_input: swift_mount_check} - # NOTE(dprince): build_ring support is currently not wired in. - # See: https://review.openstack.org/#/c/109225/ - tripleo::ringbuilder::build_ring: True - # Cinder cinder_enable_db_purge: {get_input: cinder_enable_db_purge} cinder_enable_nfs_backend: {get_input: cinder_enable_nfs_backend} |