aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-19 15:12:34 +0000
committerGerrit Code Review <review@openstack.org>2017-04-19 15:12:34 +0000
commit8c86ce42ce26299c3af8f54df52f04c7d6a9e34f (patch)
tree8d4a41c7378d92f92756935fd15d68382ab31f6c /puppet/services
parent1fa377d565e1649281f01883811cd7e899fce9d1 (diff)
parent96d3e644837565d3a8b4b728ace57156000f3134 (diff)
Merge "Decouple Swift ringbuilding logic" into stable/ocata
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/swift-ringbuilder.yaml10
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet/services/swift-ringbuilder.yaml b/puppet/services/swift-ringbuilder.yaml
index 2e3c818f..f62d5e18 100644
--- a/puppet/services/swift-ringbuilder.yaml
+++ b/puppet/services/swift-ringbuilder.yaml
@@ -42,6 +42,14 @@ parameters:
default: true
description: 'Use a local directory for Swift storage services when building rings'
type: boolean
+ SwiftRingGetTempurl:
+ default: ''
+ description: A temporary Swift URL to download rings from.
+ type: string
+ SwiftRingPutTempurl:
+ default: ''
+ description: A temporary Swift URL to upload rings to.
+ type: string
conditions:
swift_use_local_dir:
@@ -59,6 +67,8 @@ outputs:
value:
service_name: swift_ringbuilder
config_settings:
+ tripleo::profile::base::swift::ringbuilder::swift_ring_get_tempurl: {get_param: SwiftRingGetTempurl}
+ tripleo::profile::base::swift::ringbuilder::swift_ring_put_tempurl: {get_param: SwiftRingPutTempurl}
tripleo::profile::base::swift::ringbuilder::build_ring: {get_param: SwiftRingBuild}
tripleo::profile::base::swift::ringbuilder::replicas: {get_param: SwiftReplicas}
tripleo::profile::base::swift::ringbuilder::part_power: {get_param: SwiftPartPower}