From f25c60a03be766a2612a9b3cba42085cb3e251cb Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 7 May 2022 01:25:48 +0900 Subject: [PATCH] Fix missing updates of deprecated parameters This is follow-up of 7eeb46e04d61189925dbbaa06d3016a0235d6200 and fixes the following two points. - tenant_name is deprecated but a proper warning message is missing - password is deprecated and now is optional, but it is still validated Closes-Bug: #1973315 Change-Id: I169d42dee4896843e55d4989dc440ad7e7c7ec94 --- manifests/keystone/auth_websocket.pp | 5 ++--- releasenotes/notes/bug-1973315-c083a70b5835a5d0.yaml | 5 +++++ spec/classes/zaqar_keystone_auth_websocket_spec.rb | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/bug-1973315-c083a70b5835a5d0.yaml diff --git a/manifests/keystone/auth_websocket.pp b/manifests/keystone/auth_websocket.pp index f25e13c..7e2d87c 100644 --- a/manifests/keystone/auth_websocket.pp +++ b/manifests/keystone/auth_websocket.pp @@ -69,7 +69,6 @@ class zaqar::keystone::auth_websocket( $admin_url = 'ws://127.0.0.1:9000', $internal_url = 'ws://127.0.0.1:9000', $region = 'RegionOne', - $tenant = 'services', $configure_endpoint = true, $configure_service = true, $service_description = 'OpenStack Messaging Websocket Service', @@ -77,18 +76,18 @@ class zaqar::keystone::auth_websocket( $auth_name = undef, $password = undef, $email = undef, + $tenant = undef, $configure_user = undef, $configure_user_role = undef, ) { include zaqar::deps - validate_legacy(String, 'validate_string', $password) - [ 'auth_name', 'password', 'email', + 'tenant', 'configure_user', 'configure_user_role' ].each |String $param| { diff --git a/releasenotes/notes/bug-1973315-c083a70b5835a5d0.yaml b/releasenotes/notes/bug-1973315-c083a70b5835a5d0.yaml new file mode 100644 index 0000000..45c46bb --- /dev/null +++ b/releasenotes/notes/bug-1973315-c083a70b5835a5d0.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Validation of the deprecated ``zaqar::keystone::auth_websocket::password`` + parameter has been removed and the parameter is no longer required. diff --git a/spec/classes/zaqar_keystone_auth_websocket_spec.rb b/spec/classes/zaqar_keystone_auth_websocket_spec.rb index b268e81..e030923 100644 --- a/spec/classes/zaqar_keystone_auth_websocket_spec.rb +++ b/spec/classes/zaqar_keystone_auth_websocket_spec.rb @@ -8,7 +8,7 @@ describe 'zaqar::keystone::auth_websocket' do shared_examples_for 'zaqar::keystone::auth_websocket' do context 'with default class parameters' do let :params do - { :password => 'zaqar-websocket_password' } + {} end it { is_expected.to contain_keystone__resource__service_identity('zaqar-websocket').with(