openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Simplify composition of swift-proxy-server pipelines 

This change refactors the logic to genrate swift-proxy-server pipelines
by replacing current usage of yaql by native list_concat function.

Change-Id: Ia407b54ba11acdc788c349e2ff0e973f94d1d450
This commit is contained in:
Takashi Kajinami 2020-12-23 00:08:27 +09:00
parent 87626bb69b
commit 971438dd8d
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::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