openstack/puppet-swift
Code Issues Proposed changes

Unset default signing dir

Browse Source 
Unset default signing dir to allow the keystoneclient to set its own.
The specified /etc/swift location is not ideal and breaks on recent
keystoneclients

Change-Id: I16aadb77ee85e84645fe6745760a2c6edee49c2b
This commit is contained in:
Chris Ricker 2013-06-24 19:43:55 -07:00
parent d945c1f979
commit fb293273ea
2 changed files with 0 additions and 4 deletions

3
spec/classes/swift_proxy_authtoken_spec.rb

@ -25,7 +25,6 @@ describe 'swift::proxy::authtoken' do
[ [
'[filter:authtoken]', '[filter:authtoken]',
'paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory', 'paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory',
'signing_dir = /etc/swift',
'auth_host = 127.0.0.1', 'auth_host = 127.0.0.1',
'auth_port = 35357', 'auth_port = 35357',
'auth_protocol = http', 'auth_protocol = http',
@ -51,7 +50,6 @@ describe 'swift::proxy::authtoken' do
[ [
'[filter:authtoken]', '[filter:authtoken]',
'paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory', 'paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory',
'signing_dir = /etc/swift',
'auth_host = 127.0.0.1', 'auth_host = 127.0.0.1',
'auth_port = 35357', 'auth_port = 35357',
'auth_protocol = http', 'auth_protocol = http',
@ -82,7 +80,6 @@ describe 'swift::proxy::authtoken' do
[ [
'[filter:authtoken]', '[filter:authtoken]',
'paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory', 'paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory',
'signing_dir = /etc/swift',
'auth_host = some.host', 'auth_host = some.host',
'auth_port = 443', 'auth_port = 443',
'auth_protocol = https', 'auth_protocol = https',

1
templates/proxy/authtoken.conf.erb

@ -1,6 +1,5 @@
[filter:authtoken] [filter:authtoken]
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
signing_dir = /etc/swift
auth_host = <%= auth_host %> auth_host = <%= auth_host %>
auth_port = <%= auth_port %> auth_port = <%= auth_port %>
auth_protocol = <%= auth_protocol %> auth_protocol = <%= auth_protocol %>