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
commit bf17c1d97f
1 changed files with 12 additions and 17 deletions

View File

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