stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #492 from enovance/remove_ceilometer_swift_middleware

Browse Source 
Disable ceilometer middleware for swift
This commit is contained in:
Emilien Macchi 2014-06-04 18:38:14 +02:00
commit eff8b14f10
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/object/controller.pp
View File

@ -40,7 +40,11 @@ class cloud::object::controller(
'catch_errors', 'healthcheck', 'cache', 'ratelimit', 'catch_errors', 'healthcheck', 'cache', 'ratelimit',
#'swift3', 's3token', 'container_quotas', 'account_quotas', 'tempurl', #'swift3', 's3token', 'container_quotas', 'account_quotas', 'tempurl',
'swift3', 's3token', 'tempurl', 'swift3', 's3token', 'tempurl',
'formpost', 'staticweb', 'ceilometer', 'authtoken', 'keystone', 'formpost', 'staticweb',
# TODO: (spredzy) re enable ceilometer middleware after the current bug as been fixed
# https://review.openstack.org/#/c/97702
# 'ceilometer',
'authtoken', 'keystone',
'proxy-logging', 'proxy-server'], 'proxy-logging', 'proxy-server'],
account_autocreate => true, account_autocreate => true,
log_level => 'DEBUG', log_level => 'DEBUG',
@ -64,7 +68,9 @@ log_statsd_default_sample_rate = 1
#class { 'swift::proxy::container_quotas': } #class { 'swift::proxy::container_quotas': }
#class { 'swift::proxy::bulk': } #class { 'swift::proxy::bulk': }
class { 'swift::proxy::staticweb': } class { 'swift::proxy::staticweb': }
class { 'swift::proxy::ceilometer': } # TODO: (spredzy) re enable ceilometer middleware after the current bug as been fixed
# https://review.openstack.org/#/c/97702
#class { 'swift::proxy::ceilometer': }
class { 'swift::proxy::keystone': class { 'swift::proxy::keystone':
operator_roles => ['admin', 'SwiftOperator', 'ResellerAdmin'], operator_roles => ['admin', 'SwiftOperator', 'ResellerAdmin'],
} }