openstack/puppet-openstack-integration
Code Issues Proposed changes

Modernize swift-proxy-server pipeline

Browse Source 
This change updates the pipeline parameter of swift-proxy-server,
so that some middlewares to use basic features are enabled in
integration/litmus jobs.

Depends-on: https://review.opendev.org/776826
Change-Id: I32ee15de80467ede3adceaf7bd34ed3edef7bc43
This commit is contained in:
Takashi Kajinami 2021-02-21 00:24:04 +09:00
parent 4961a6bf34
commit c4b36922d5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/swift.pp
View File

@ -53,13 +53,15 @@ class openstack_integration::swift {
proxy_local_net_ip => $::openstack_integration::config::host, proxy_local_net_ip => $::openstack_integration::config::host,
workers => '2', workers => '2',
pipeline => [ pipeline => [
'catch_errors', 'healthcheck', 'cache', 'tempurl', 'ratelimit', 'catch_errors', 'gatekeeper', 'healthcheck', 'proxy-logging', 'cache',
'authtoken', 'keystone', 'formpost', 'staticweb', 'container_quotas', 'listing_formats', 'tempurl', 'ratelimit', 'authtoken', 'keystone',
'account_quotas', 'proxy-logging', 'proxy-server' 'copy', 'formpost', 'staticweb', 'container_quotas', 'account_quotas',
'proxy-logging', 'proxy-server'
], ],
node_timeout => 30, node_timeout => 30,
} }
include swift::proxy::catch_errors include swift::proxy::catch_errors
include swift::proxy::gatekeeper
include swift::proxy::healthcheck include swift::proxy::healthcheck
include swift::proxy::proxy_logging include swift::proxy::proxy_logging
# Note (dmsimard): ipv6 parsing in Swift and keystone_authtoken are # Note (dmsimard): ipv6 parsing in Swift and keystone_authtoken are
@ -67,6 +69,7 @@ class openstack_integration::swift {
class { 'swift::proxy::cache': class { 'swift::proxy::cache':
memcache_servers => $::openstack_integration::config::swift_memcached_servers memcache_servers => $::openstack_integration::config::swift_memcached_servers
} }
include swift::proxy::listing_formats
include swift::proxy::tempurl include swift::proxy::tempurl
include swift::proxy::ratelimit include swift::proxy::ratelimit
class { 'swift::proxy::authtoken': class { 'swift::proxy::authtoken':
@ -77,11 +80,11 @@ class openstack_integration::swift {
class { 'swift::proxy::keystone': class { 'swift::proxy::keystone':
operator_roles => ['member', 'admin', 'SwiftOperator'] operator_roles => ['member', 'admin', 'SwiftOperator']
} }
include swift::proxy::copy
include swift::proxy::formpost include swift::proxy::formpost
include swift::proxy::staticweb include swift::proxy::staticweb
include swift::proxy::container_quotas include swift::proxy::container_quotas
include swift::proxy::account_quotas include swift::proxy::account_quotas
include swift::proxy::tempauth
class { 'swift::keystone::auth': class { 'swift::keystone::auth':
public_url => "http://${::openstack_integration::config::ip_for_url}:8080/v1/AUTH_%(tenant_id)s", public_url => "http://${::openstack_integration::config::ip_for_url}:8080/v1/AUTH_%(tenant_id)s",
admin_url => "http://${::openstack_integration::config::ip_for_url}:8080", admin_url => "http://${::openstack_integration::config::ip_for_url}:8080",