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

openstack-archive · Jan 13, 2021 · bf17c1d · bf17c1d
2 parents 3ab975c + 971438d
commit bf17c1d
Showing 1 changed file with 12 additions and 17 deletions.
diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml
@@ -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:
-                    - swift_encryption_enabled
-                    - 'kms_keymaster'
-                    - ''
-                  -
-                    if:
+                    -
+                      - 'ceilometer'
+                    - []
+                - if:
                     - swift_encryption_enabled
-                    - 'encryption'
-                    - ''
+                    -
+                      - 'kms_keymaster'
+                      - 'encryption'
+                    - []
+                -
                   - 'proxy-logging'
                   - 'proxy-server'
             swift::proxy::account_autocreate: true