Merge "Fix ordering of Swift pipeline values"
This commit is contained in:
commit
09571dda2a
|
@ -189,6 +189,9 @@ outputs:
|
||||||
swift::keymaster::user_domain_id: 'default'
|
swift::keymaster::user_domain_id: 'default'
|
||||||
swift::keymaster::auth_endpoint: {get_param: [EndpointMap, KeystoneInternal, uri]}
|
swift::keymaster::auth_endpoint: {get_param: [EndpointMap, KeystoneInternal, uri]}
|
||||||
- swift::proxy::pipeline:
|
- 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:
|
list_concat:
|
||||||
- - 'catch_errors'
|
- - 'catch_errors'
|
||||||
- 'gatekeeper'
|
- 'gatekeeper'
|
||||||
|
@ -211,8 +214,6 @@ outputs:
|
||||||
- 'slo'
|
- 'slo'
|
||||||
- 'dlo'
|
- 'dlo'
|
||||||
- 'versioned_writes'
|
- 'versioned_writes'
|
||||||
- 'proxy-logging'
|
|
||||||
- 'proxy-server'
|
|
||||||
- if:
|
- if:
|
||||||
- {get_param: SwiftCeilometerPipelineEnabled}
|
- {get_param: SwiftCeilometerPipelineEnabled}
|
||||||
- - 'ceilometer'
|
- - 'ceilometer'
|
||||||
|
@ -220,6 +221,8 @@ outputs:
|
||||||
- {get_param: SwiftEncryptionEnabled}
|
- {get_param: SwiftEncryptionEnabled}
|
||||||
- - 'kms_keymaster'
|
- - 'kms_keymaster'
|
||||||
- 'encryption'
|
- 'encryption'
|
||||||
|
- - 'proxy-logging'
|
||||||
|
- 'proxy-server'
|
||||||
swift::proxy::account_autocreate: true
|
swift::proxy::account_autocreate: true
|
||||||
# NOTE: bind IP is found in hiera replacing the network name with the
|
# NOTE: bind IP is found in hiera replacing the network name with the
|
||||||
# local node IP for the given network; replacement examples
|
# local node IP for the given network; replacement examples
|
||||||
|
|
Loading…
Reference in New Issue