openstack
/
puppet-zaqar
Code Issues Proposed changes

Remove deprecated parameters for websocket service user 

... because these parameters were deprecated during Yoga cycle[1] and
have had no effect since then.

[1] 7eeb46e04d

Change-Id: I6b2ee2e3e9fb633f5f3c6fa9b2e4106e5430484e
This commit is contained in:
Takashi Kajinami 2022-06-19 22:04:51 +09:00
parent d3e8ce069a
commit ff956c7a5b
2 changed files with 21 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
manifests/keystone/auth_websocket.pp
View File

@ -40,62 +40,20 @@
# (Optional) Description for keystone service.
# Defaults to 'OpenStack Messaging Websocket Service'.
#
# DEPRECATED PARAMETERS
#
# [*password*]
# (Optional) Password for zaqar websocket user. Defaults to undef.
#
# [*auth_name*]
# (Optional) Username for zaqar service. Defaults to undef.
#
# [*email*]
# (Optional) Email for zaqar websocket user. Defaults to undef.
#
# [*tenant*]
# (Optional) Tenant for zaqar websocket user. Defaults to undef.
#
# [*configure_user*]
# (Optional) Should the service user be configured?
# Defaults to undef
#
# [*configure_user_role*]
# (Optional) Whether to configure the admin role for the service user.
# Defaults to undef
#
class zaqar::keystone::auth_websocket(
$service_name = 'zaqar-websocket',
$service_type = 'messaging-websocket',
$public_url = 'ws://127.0.0.1:9000',
$admin_url = 'ws://127.0.0.1:9000',
$internal_url = 'ws://127.0.0.1:9000',
$region = 'RegionOne',
$configure_endpoint = true,
$configure_service = true,
$service_description = 'OpenStack Messaging Websocket Service',
# DEPRECATED PARAMETERS
$auth_name = undef,
$password = undef,
$email = undef,
$tenant = undef,
$configure_user = undef,
$configure_user_role = undef,
$service_name = 'zaqar-websocket',
$service_type = 'messaging-websocket',
$public_url = 'ws://127.0.0.1:9000',
$admin_url = 'ws://127.0.0.1:9000',
$internal_url = 'ws://127.0.0.1:9000',
$region = 'RegionOne',
$configure_endpoint = true,
$configure_service = true,
$service_description = 'OpenStack Messaging Websocket Service',
) {
include zaqar::deps
[
'auth_name',
'password',
'email',
'tenant',
'configure_user',
'configure_user_role'
].each |String $param| {
if getvar($param) != undef {
warning("The zaqar::keystone::auth_websocket::${param} parameter is deprecated and has no effect")
}
}
Keystone::Resource::Service_identity['zaqar-websocket'] -> Anchor['zaqar::service::end']
keystone::resource::service_identity { 'zaqar-websocket':

12
releasenotes/notes/cleanup-websocket-auth-8e0fb1386f597483.yaml Normal file
View File

@ -0,0 +1,12 @@
---
upgrade:
- |
The following parameters of the ``zaqar::keystone::auth_websocket`` class
have been removed.
- ``configure_user``
- ``configure_user_role``
- ``auth_name``
- ``password``
- ``email``
- ``tenant``