openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Simplify composition of swift-proxy-server pipelines"

This commit is contained in:
Zuul 2021-01-13 21:04:38 +00:00 committed by Gerrit Code Review
parent 3ab975c4b7 971438dd8d
commit bf17c1d97f
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
deployment/swift/swift-proxy-container-puppet.yaml
View File

@ -199,10 +199,8 @@ outputs:
swift::keymaster::auth_endpoint: {get_param: [EndpointMap, KeystoneInternal, uri]} swift::keymaster::auth_endpoint: {get_param: [EndpointMap, KeystoneInternal, uri]}
- {} - {}
- swift::proxy::pipeline: - swift::proxy::pipeline:
yaql: list_concat:
expression: $.data.pipeline.where($ != '') -
data:
pipeline:
- 'catch_errors' - 'catch_errors'
- 'healthcheck' - 'healthcheck'
- 'proxy-logging' - 'proxy-logging'
@ -222,21 +220,18 @@ outputs:
- 'slo' - 'slo'
- 'dlo' - 'dlo'
- 'versioned_writes' - 'versioned_writes'
- - if:
if:
- ceilometer_pipeline_enabled - ceilometer_pipeline_enabled
- 'ceilometer' -
- '' - 'ceilometer'
- - []
if: - if:
- swift_encryption_enabled - swift_encryption_enabled
- 'kms_keymaster' -
- '' - 'kms_keymaster'
- - 'encryption'
if: - []
- swift_encryption_enabled -
- 'encryption'
- ''
- 'proxy-logging' - 'proxy-logging'
- 'proxy-server' - 'proxy-server'
swift::proxy::account_autocreate: true swift::proxy::account_autocreate: true