openstack
/
puppet-swift
Code Issues Proposed changes

authtoken: Remove deprecated auth_plugin 

The parameter was deprecated during Victoria cycle[1] in favor of
the auth_type parameter.

[1] 5722f7149c

Change-Id: Ibc261c2e2ba9fa9ba547ad5d0f736c1b7230c579
This commit is contained in:
Takashi Kajinami 2022-09-29 09:09:30 +09:00
parent febcd8fa44
commit 7e821025b2
3 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/proxy/authtoken.pp
View File

@ -85,12 +85,6 @@
# "public", "internal" or "admin".
# Defaults to $::os_service_default.
#
# DEPRECATED PARAMETERS
#
# [*auth_plugin*]
# (Optional) The plugin for authentication
# Defaults to undef
#
# == Authors
#
# Dan Bode dan@puppetlabs.com
@ -117,8 +111,6 @@ class swift::proxy::authtoken(
$service_token_roles_required = $::os_service_default,
$service_type = $::os_service_default,
$interface = $::os_service_default,
# DEPRECATED PARAMETERS
$auth_plugin = undef,
) inherits swift::params {
include swift::deps
@ -131,13 +123,6 @@ Please set password parameter')
$password_real = $password
}
if $auth_plugin != undef {
warning('auth_plugin is deprecated. please use auth_type instead')
$auth_type_real = $auth_plugin
} else {
$auth_type_real = $auth_type
}
if is_service_default($system_scope) {
$project_name_real = $project_name
$project_domain_id_real = $project_domain_id
@ -151,7 +136,7 @@ Please set password parameter')
'filter:authtoken/paste.filter_factory': value => 'keystonemiddleware.auth_token:filter_factory';
'filter:authtoken/www_authenticate_uri': value => $www_authenticate_uri;
'filter:authtoken/auth_url': value => $auth_url;
'filter:authtoken/auth_type': value => $auth_type_real;
'filter:authtoken/auth_type': value => $auth_type;
'filter:authtoken/username': value => $username;
'filter:authtoken/user_domain_id': value => $user_domain_id;
'filter:authtoken/password': value => $password_real, secret => true;
@ -167,9 +152,4 @@ Please set password parameter')
'filter:authtoken/service_type': value => $service_type;
'filter:authtoken/interface': value => $interface,
}
# cleanup the deprecated parameter
swift_proxy_config {
'filter:authtoken/auth_plugin': ensure => 'absent';
}
}

5
releasenotes/notes/remove-authtoken-auth_plugin-43478ec4f2df8ec8.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The ``swift::proxy::authtoken::auth_plugin`` parameter has been removed.
Use the ``auth_type`` parameter instead.

2
spec/classes/swift_proxy_authtoken_spec.rb
View File

@ -22,7 +22,6 @@ describe 'swift::proxy::authtoken' do
it { is_expected.to contain_swift_proxy_config('filter:authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_swift_proxy_config('filter:authtoken/service_type').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_swift_proxy_config('filter:authtoken/interface').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_swift_proxy_config('filter:authtoken/auth_plugin').with_ensure('absent') }
end
describe "when overriding parameters" do
@ -60,7 +59,6 @@ describe 'swift::proxy::authtoken' do
it { is_expected.to contain_swift_proxy_config('filter:authtoken/service_token_roles_required').with_value(true) }
it { is_expected.to contain_swift_proxy_config('filter:authtoken/service_type').with_value('identity') }
it { is_expected.to contain_swift_proxy_config('filter:authtoken/interface').with_value('internal') }
it { is_expected.to contain_swift_proxy_config('filter:authtoken/auth_plugin').with_ensure('absent') }
end
describe 'when overriding www_authenticate_uri' do