x/packstack
Code Issues Proposed changes

Merge "Removing references to s3"

Browse Source
This commit is contained in:
Jenkins
2013-02-08 12:14:46 +00:00
committed by Gerrit Code Review
parent 8132d43ee7 fcf0b0d9d9
commit 18a9aaaa06
1 changed files with 0 additions and 9 deletions
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', 'healthcheck',
'cache', 'cache',
# 'ratelimit', # 'ratelimit',
# 'swift3',
# 's3token',
'authtoken', 'authtoken',
'keystone', 'keystone',
'proxy-server' 'proxy-server'
@@ -25,7 +23,6 @@ class { [
'swift::proxy::catch_errors', 'swift::proxy::catch_errors',
'swift::proxy::healthcheck', 'swift::proxy::healthcheck',
'swift::proxy::cache', 'swift::proxy::cache',
'swift::proxy::swift3',
]: } ]: }
class { 'swift::proxy::ratelimit': class { 'swift::proxy::ratelimit':
@@ -36,12 +33,6 @@ class { 'swift::proxy::ratelimit':
account_ratelimit => 0 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': class { 'swift::proxy::keystone':
operator_roles => ['admin', 'SwiftOperator'], operator_roles => ['admin', 'SwiftOperator'],
} }