stackforge/puppet-openstack-cloud
Code Issues Proposed changes

swift-proxy: enable middlewares

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2013-11-26 13:40:55 +01:00
parent 63940986af
commit 7876fd7dbe
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
roles/object-storage/swift_proxy.pp
View File

@@ -33,9 +33,10 @@ class os_swift_proxy(
proxy_local_net_ip => $local_ip, proxy_local_net_ip => $local_ip,
port => $os_params::swift_port, port => $os_params::swift_port,
pipeline => [ pipeline => [
'catch_errors', 'healthcheck', 'cache', 'ratelimit', 'catch_errors', 'healthcheck', 'cache', 'bulk', 'ratelimit',
'swift3', 's3token', 'tempurl', 'formpost', 'authtoken', 'swift3', 's3token', 'container-quotas', 'account-quotas', 'tempurl',
'keystone', 'proxy-logging', 'proxy-server'], 'formpost', 'staticweb', 'ceilometer', 'authtoken', 'keystone',
'proxy-logging', 'proxy-server'],
account_autocreate => true, account_autocreate => true,
log_level => 'DEBUG', log_level => 'DEBUG',
workers => inline_template('<%= processorcount.to_i * 2 %> workers => inline_template('<%= processorcount.to_i * 2 %>
@@ -45,16 +46,20 @@ log_statsd_port = <%= scope.lookupvar("os_params::statsd_port") %>
log_statsd_default_sample_rate = 1 log_statsd_default_sample_rate = 1
'), '),
} }
class{'swift::proxy::cache': class{'swift::proxy::cache':
memcache_servers => inline_template( memcache_servers => inline_template(
'<%= scope.lookupvar("os_params::swift_memchached").join(",") %>'), '<%= scope.lookupvar("os_params::swift_memchached").join(",") %>'),
} }
class { 'swift::proxy::proxy-logging': } class { 'swift::proxy::proxy-logging': }
class { 'swift::proxy::healthcheck': } class { 'swift::proxy::healthcheck': }
class { 'swift::proxy::catch_errors': } class { 'swift::proxy::catch_errors': }
class { 'swift::proxy::ratelimit': } class { 'swift::proxy::ratelimit': }
class { 'swift::proxy::account_quotas': }
class { 'swift::proxy::container_quotas': }
class { 'swift::proxy::bulk': }
class { 'swift::proxy::staticweb': }
class { 'swift::proxy::ceilometer': }
class { 'swift::proxy::keystone': class { 'swift::proxy::keystone':
operator_roles => ['admin', 'SwiftOperator', 'ResellerAdmin'], operator_roles => ['admin', 'SwiftOperator', 'ResellerAdmin'],
} }
@@ -68,7 +73,6 @@ log_statsd_default_sample_rate = 1
delay_auth_decision => inline_template('1 delay_auth_decision => inline_template('1
cache = swift.cache') cache = swift.cache')
} }
class { 'swift::proxy::swift3': class { 'swift::proxy::swift3':
ensure => 'latest', ensure => 'latest',
} }