x
/
packstack
Code Issues Proposed changes

Merge "Removing references to s3" into folsom

This commit is contained in:
Jenkins 2013-02-11 15:26:34 +00:00 committed by Gerrit Code Review
parent 3079f0eb04 a77ada823f
commit 6e7571d967
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packstack/puppet/templates/swift_proxy.pp
View File

@ -11,8 +11,6 @@ class { 'swift::proxy':
'healthcheck',
'cache',
# 'ratelimit',
# 'swift3',
# 's3token',
'authtoken',
'keystone',
'proxy-server'
@ -25,7 +23,6 @@ class { [
'swift::proxy::catch_errors',
'swift::proxy::healthcheck',
'swift::proxy::cache',
'swift::proxy::swift3',
]: }
class { 'swift::proxy::ratelimit':
@ -36,12 +33,6 @@ class { 'swift::proxy::ratelimit':
account_ratelimit => 0
}
class { 'swift::proxy::s3token':
# assume that the controller host is the swift api server
auth_host => $controller_node_public,
auth_port => '35357',
}
class { 'swift::proxy::keystone':
operator_roles => ['admin', 'SwiftOperator'],
}