diff --git a/spec/classes/swift_proxy_authtoken_spec.rb b/spec/classes/swift_proxy_authtoken_spec.rb index c89ce42f..dfa047d5 100644 --- a/spec/classes/swift_proxy_authtoken_spec.rb +++ b/spec/classes/swift_proxy_authtoken_spec.rb @@ -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', diff --git a/spec/classes/swift_proxy_s3token_spec.rb b/spec/classes/swift_proxy_s3token_spec.rb index 7074ed35..54baab8b 100644 --- a/spec/classes/swift_proxy_s3token_spec.rb +++ b/spec/classes/swift_proxy_s3token_spec.rb @@ -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' diff --git a/templates/proxy/authtoken.conf.erb b/templates/proxy/authtoken.conf.erb index c3eac13d..59f23b15 100644 --- a/templates/proxy/authtoken.conf.erb +++ b/templates/proxy/authtoken.conf.erb @@ -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 %> diff --git a/templates/proxy/s3token.conf.erb b/templates/proxy/s3token.conf.erb index 7fda508b..82b5363f 100644 --- a/templates/proxy/s3token.conf.erb +++ b/templates/proxy/s3token.conf.erb @@ -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 %>