diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index d8c90f9..cf799be 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -42,7 +42,7 @@ # (Optional) Authentication type to load # Defaults to 'password' # -# [*auth_uri*] +# [*www_authenticate_uri*] # (Optional) Complete public Identity API endpoint. # Defaults to 'http://localhost:5000' # @@ -180,6 +180,12 @@ # (in seconds). Set to -1 to disable caching completely. Integer value # Defaults to $::os_service_default. # +# DEPRECATED PARAMETERS +# +# [*auth_uri*] +# (Optional) Complete public Identity API endpoint. +# Defaults to undef +# class watcher::keystone::authtoken ( $password = $::os_service_default, $username = 'watcher', @@ -190,7 +196,7 @@ class watcher::keystone::authtoken ( $insecure = $::os_service_default, $auth_section = $::os_service_default, $auth_type = 'password', - $auth_uri = 'http://localhost:5000', + $www_authenticate_uri = 'http://localhost:5000', $auth_version = $::os_service_default, $cache = $::os_service_default, $cafile = $::os_service_default, @@ -215,6 +221,8 @@ class watcher::keystone::authtoken ( $manage_memcache_package = false, $region_name = $::os_service_default, $token_cache_time = $::os_service_default, + # DEPRECATED PARAMETERS + $auth_uri = undef, ) { include ::watcher::deps @@ -225,12 +233,17 @@ class watcher::keystone::authtoken ( validate_string($password) + if $auth_uri { + warning('The auth_uri parameter is deprecated. Please use www_authenticate_uri instead.') + } + $www_authenticate_uri_real = pick($auth_uri, $www_authenticate_uri) + keystone::resource::authtoken { 'watcher_config': password => $password, username => $username, project_name => $project_name, auth_url => $auth_url, - auth_uri => $auth_uri, + www_authenticate_uri => $www_authenticate_uri_real, auth_version => $auth_version, auth_type => $auth_type, auth_section => $auth_section, diff --git a/releasenotes/notes/deprecate_auth_uri_parameter-93fd3119f74b8769.yaml b/releasenotes/notes/deprecate_auth_uri_parameter-93fd3119f74b8769.yaml new file mode 100644 index 0000000..86d56c0 --- /dev/null +++ b/releasenotes/notes/deprecate_auth_uri_parameter-93fd3119f74b8769.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - auth_uri is deprecated and will be removed in a future release. + Please use www_authenticate_uri instead. diff --git a/spec/classes/watcher_keystone_authtoken_spec.rb b/spec/classes/watcher_keystone_authtoken_spec.rb index 9b18725..dd49425 100644 --- a/spec/classes/watcher_keystone_authtoken_spec.rb +++ b/spec/classes/watcher_keystone_authtoken_spec.rb @@ -24,7 +24,7 @@ describe 'watcher::keystone::authtoken' do is_expected.to contain_watcher_config('keystone_authtoken/insecure').with_value('') is_expected.to contain_watcher_config('keystone_authtoken/auth_section').with_value('') is_expected.to contain_watcher_config('keystone_authtoken/auth_type').with_value('password') - is_expected.to contain_watcher_config('keystone_authtoken/auth_uri').with_value('http://localhost:5000') + is_expected.to contain_watcher_config('keystone_authtoken/www_authenticate_uri').with_value('http://localhost:5000') is_expected.to contain_watcher_config('keystone_authtoken/auth_version').with_value('') is_expected.to contain_watcher_config('keystone_authtoken/cache').with_value('') is_expected.to contain_watcher_config('keystone_authtoken/cafile').with_value('') @@ -54,7 +54,7 @@ describe 'watcher::keystone::authtoken' do context 'when overriding parameters' do before do params.merge!({ - :auth_uri => 'https://10.0.0.1:9999/', + :www_authenticate_uri => 'https://10.0.0.1:9999/', :username => 'myuser', :password => 'mypasswd', :auth_url => 'http://:127.0.0.1:35357', @@ -92,7 +92,7 @@ describe 'watcher::keystone::authtoken' do end it 'configure keystone_authtoken' do - is_expected.to contain_watcher_config('keystone_authtoken/auth_uri').with_value('https://10.0.0.1:9999/') + is_expected.to contain_watcher_config('keystone_authtoken/www_authenticate_uri').with_value('https://10.0.0.1:9999/') is_expected.to contain_watcher_config('keystone_authtoken/username').with_value(params[:username]) is_expected.to contain_watcher_config('keystone_authtoken/password').with_value(params[:password]).with_secret(true) is_expected.to contain_watcher_config('keystone_authtoken/auth_url').with_value(params[:auth_url])