openstack
/
puppet-swift
Code Issues Proposed changes

Use keystonemiddleware instead of client 

The auth_token middleware that lives in
keystoneclient.middleware.auth_token has been deprecated in favour of
keystonemiddleware.auth_token.

This prints a deprecation warning and means we are not getting new
features.

Closes-Bug: #1428376
Change-Id: If5352801b8105533600965a25f02a577a858f1a2
This commit is contained in:
Jamie Lennox 2015-03-05 10:35:04 +11:00
parent 0d40df78fe
commit 128ce97061
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spec/classes/swift_proxy_authtoken_spec.rb
View File

@ -37,7 +37,7 @@ describe 'swift::proxy::authtoken' do
'[filter:authtoken]',
'log_name = swift',
'signing_dir = /var/cache/swift',
'paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory',
'paste.filter_factory = keystonemiddleware.auth_token:filter_factory',
'auth_host = 127.0.0.1',
'auth_port = 35357',
'auth_protocol = http',
@ -66,7 +66,7 @@ describe 'swift::proxy::authtoken' do
'[filter:authtoken]',
'log_name = swift',
'signing_dir = /var/cache/swift',
'paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory',
'paste.filter_factory = keystonemiddleware.auth_token:filter_factory',
'auth_host = 127.0.0.1',
'auth_port = 35357',
'auth_protocol = http',
@ -102,7 +102,7 @@ describe 'swift::proxy::authtoken' do
'[filter:authtoken]',
'log_name = swift',
'signing_dir = /home/swift/keystone-signing',
'paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory',
'paste.filter_factory = keystonemiddleware.auth_token:filter_factory',
'auth_host = some.host',
'auth_port = 443',
'auth_protocol = https',

4
spec/classes/swift_proxy_s3token_spec.rb
View File

@ -22,7 +22,7 @@ describe 'swift::proxy::s3token' do
verify_contents(subject, fragment_file,
[
'[filter:s3token]',
'paste.filter_factory = keystoneclient.middleware.s3_token:filter_factory',
'paste.filter_factory = keystonemiddleware.s3_token:filter_factory',
'auth_port = 35357',
'auth_protocol = http',
'auth_host = 127.0.0.1'
@ -43,7 +43,7 @@ describe 'swift::proxy::s3token' do
verify_contents(subject, fragment_file,
[
'[filter:s3token]',
'paste.filter_factory = keystoneclient.middleware.s3_token:filter_factory',
'paste.filter_factory = keystonemiddleware.s3_token:filter_factory',
'auth_port = 4212',
'auth_protocol = https',
'auth_host = 1.2.3.4'

2
templates/proxy/authtoken.conf.erb
View File

@ -1,7 +1,7 @@
[filter:authtoken]
log_name = swift
signing_dir = <%= @signing_dir %>
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
paste.filter_factory = keystonemiddleware.auth_token:filter_factory
auth_host = <%= @auth_host %>
auth_port = <%= @auth_port %>
auth_protocol = <%= @auth_protocol %>

2
templates/proxy/s3token.conf.erb
View File

@ -1,5 +1,5 @@
[filter:s3token]
paste.filter_factory = keystoneclient.middleware.s3_token:filter_factory
paste.filter_factory = keystonemiddleware.s3_token:filter_factory
auth_port = <%= @auth_port %>
auth_protocol = <%= @auth_protocol %>
auth_host = <%= @auth_host %>