openstack/puppet-keystone
Code Issues Proposed changes

Remove member_role_id/name

Browse Source 
These parameters were deprecated during Yoga cycle[1] and have had no
effect since then.

[1] f4bba7122a4d3010be3905b4314071a71307f1f1

Change-Id: I0e212c99a2295b447286056355237212920e5ee2
This commit is contained in:
Takashi Kajinami 2022-05-09 08:26:56 +09:00
parent afc28df75d
commit 0fd586f63c
2 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
manifests/init.pp
View File

@ -314,18 +314,6 @@
# #
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
# [*member_role_id*]
# (Optional) Similar to the member_role_name option, this represents the
# default role ID used to associate users with their default projects in the
# v2 API. This will be used as the explicit role where one is not specified
# by the v2 API.
# Defaults to undef
#
# [*member_role_name*]
# (Optional) # This is the role name used in combination with the
# member_role_id option; see that option for more detail.
# Defaults to undef
#
# [*admin_endpoint*] # [*admin_endpoint*]
# (Optional) The base admin endpoint URL for keystone that are # (Optional) The base admin endpoint URL for keystone that are
# advertised to clients (NOTE: this does NOT affect how keystone listens # advertised to clients (NOTE: this does NOT affect how keystone listens
@ -438,8 +426,6 @@ class keystone(
$purge_config = false, $purge_config = false,
$amqp_durable_queues = $::os_service_default, $amqp_durable_queues = $::os_service_default,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$member_role_id = undef,
$member_role_name = undef,
$admin_endpoint = undef, $admin_endpoint = undef,
$catalog_type = undef, $catalog_type = undef,
$log_dir = undef, $log_dir = undef,
@ -491,14 +477,6 @@ class keystone(
include keystone::db include keystone::db
include keystone::params include keystone::params
if $member_role_id != undef {
warning('The keystone::member_role_id parameter is deprecated and has no effect')
}
if $member_role_name != undef {
warning('The keystone::member_role_name parameter is deprecated and has no effect')
}
if $log_dir != undef { if $log_dir != undef {
warning('The keystone::log_dir parameter is deprecated and has no effect.') warning('The keystone::log_dir parameter is deprecated and has no effect.')
} }
@ -507,12 +485,6 @@ class keystone(
warning('The keystone::log_file parameter is deprecated and has no effect.') warning('The keystone::log_file parameter is deprecated and has no effect.')
} }
# TODO(tkajinam): Remove this when removing member_role_* parameters
keystone_config {
'DEFAULT/member_role_id': ensure => absent;
'DEFAULT/member_role_name': ensure => absent;
}
if $admin_endpoint != undef { if $admin_endpoint != undef {
warning('The keystone::admin_endpoint parameter is deprecated. This parameter has no effect') warning('The keystone::admin_endpoint parameter is deprecated. This parameter has no effect')
} }

5
releasenotes/notes/remove-member_role-1e0ebbdf80881de6.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The ``member_role_id`` parameter and the ``member_role_name`` parameter
of the ``keystone`` class have been removed.