Merge "Fix ordering of Swift pipeline values"

deployment/swift/swift-proxy-container-puppet.yaml

@@ -189,6 +189,9 @@ outputs:
               swift::keymaster::user_domain_id: 'default'
               swift::keymaster::auth_endpoint: {get_param: [EndpointMap, KeystoneInternal, uri]}
           - swift::proxy::pipeline:
+          # NOTE: This list needs to have items in specific locations. It needs to
+          # end with proxy-server. And the two variables we're using need to be
+          # between 'versioned_writes' and 'proxy-logging'.
               list_concat:
                 - - 'catch_errors'
                   - 'gatekeeper'
@@ -211,8 +214,6 @@ outputs:
                   - 'slo'
                   - 'dlo'
                   - 'versioned_writes'
-                  - 'proxy-logging'
-                  - 'proxy-server'
                 - if:
                     - {get_param: SwiftCeilometerPipelineEnabled}
                     - - 'ceilometer'
@@ -220,6 +221,8 @@ outputs:
                     - {get_param: SwiftEncryptionEnabled}
                     - - 'kms_keymaster'
                       - 'encryption'
+                - - 'proxy-logging'
+                  - 'proxy-server'
             swift::proxy::account_autocreate: true
             # NOTE: bind IP is found in hiera replacing the network name with the
             # local node IP for the given network; replacement examples