Fix missing updates of deprecated parameters

This is follow-up of 7eeb46e04d 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
This commit is contained in:
Takashi Kajinami 2022-05-07 01:25:48 +09:00
parent 411e1ea3fe
commit f25c60a03b
3 changed files with 8 additions and 4 deletions

View File

@ -69,7 +69,6 @@ class zaqar::keystone::auth_websocket(
$admin_url = 'ws://127.0.0.1:9000', $admin_url = 'ws://127.0.0.1:9000',
$internal_url = 'ws://127.0.0.1:9000', $internal_url = 'ws://127.0.0.1:9000',
$region = 'RegionOne', $region = 'RegionOne',
$tenant = 'services',
$configure_endpoint = true, $configure_endpoint = true,
$configure_service = true, $configure_service = true,
$service_description = 'OpenStack Messaging Websocket Service', $service_description = 'OpenStack Messaging Websocket Service',
@ -77,18 +76,18 @@ class zaqar::keystone::auth_websocket(
$auth_name = undef, $auth_name = undef,
$password = undef, $password = undef,
$email = undef, $email = undef,
$tenant = undef,
$configure_user = undef, $configure_user = undef,
$configure_user_role = undef, $configure_user_role = undef,
) { ) {
include zaqar::deps include zaqar::deps
validate_legacy(String, 'validate_string', $password)
[ [
'auth_name', 'auth_name',
'password', 'password',
'email', 'email',
'tenant',
'configure_user', 'configure_user',
'configure_user_role' 'configure_user_role'
].each |String $param| { ].each |String $param| {

View File

@ -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.

View File

@ -8,7 +8,7 @@ describe 'zaqar::keystone::auth_websocket' do
shared_examples_for 'zaqar::keystone::auth_websocket' do shared_examples_for 'zaqar::keystone::auth_websocket' do
context 'with default class parameters' do context 'with default class parameters' do
let :params do let :params do
{ :password => 'zaqar-websocket_password' } {}
end end
it { is_expected.to contain_keystone__resource__service_identity('zaqar-websocket').with( it { is_expected.to contain_keystone__resource__service_identity('zaqar-websocket').with(