diff --git a/roles/object-storage/swift_proxy.pp b/roles/object-storage/swift_proxy.pp index a7cf33cb..e4871b6a 100644 --- a/roles/object-storage/swift_proxy.pp +++ b/roles/object-storage/swift_proxy.pp @@ -33,9 +33,10 @@ class os_swift_proxy( proxy_local_net_ip => $local_ip, port => $os_params::swift_port, pipeline => [ - 'catch_errors', 'healthcheck', 'cache', 'ratelimit', - 'swift3', 's3token', 'tempurl', 'formpost', 'authtoken', - 'keystone', 'proxy-logging', 'proxy-server'], + 'catch_errors', 'healthcheck', 'cache', 'bulk', 'ratelimit', + 'swift3', 's3token', 'container-quotas', 'account-quotas', 'tempurl', + 'formpost', 'staticweb', 'ceilometer', 'authtoken', 'keystone', + 'proxy-logging', 'proxy-server'], account_autocreate => true, log_level => 'DEBUG', 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 '), } + class{'swift::proxy::cache': memcache_servers => inline_template( '<%= scope.lookupvar("os_params::swift_memchached").join(",") %>'), } - class { 'swift::proxy::proxy-logging': } class { 'swift::proxy::healthcheck': } class { 'swift::proxy::catch_errors': } 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': operator_roles => ['admin', 'SwiftOperator', 'ResellerAdmin'], } @@ -68,7 +73,6 @@ log_statsd_default_sample_rate = 1 delay_auth_decision => inline_template('1 cache = swift.cache') } - class { 'swift::proxy::swift3': ensure => 'latest', }