Clean up deprecated parameters of keystone::ldap
... because these parameters were deprecated during Wallaby cycle[1].
[1] a6a78d12ac
Change-Id: I17d0f6dfa306b3d73bbd520152a91cc548ba8dc9
This commit is contained in:
Takashi Kajinami
parent
102f8d7fca
commit
b634950377
@ -237,125 +237,6 @@
|
|||||||
# LDAP support packages.
|
# LDAP support packages.
|
||||||
# Defaults to true.
|
# Defaults to true.
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*project_tree_dn*]
|
|
||||||
# Search base for projects (string value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*project_filter*]
|
|
||||||
# LDAP search filter for projects. (string value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*project_objectclass*]
|
|
||||||
# LDAP objectclass for projects. (string value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*project_id_attribute*]
|
|
||||||
# LDAP attribute mapped to project id. (string value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*project_member_attribute*]
|
|
||||||
# LDAP attribute mapped to project membership for user. (string value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*project_name_attribute*]
|
|
||||||
# LDAP attribute mapped to project name. (string value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*project_desc_attribute*]
|
|
||||||
# LDAP attribute mapped to project description. (string value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*project_enabled_attribute*]
|
|
||||||
# LDAP attribute mapped to project enabled. (string value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*project_domain_id_attribute*]
|
|
||||||
# LDAP attribute mapped to project domain_id. (string value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*project_attribute_ignore*]
|
|
||||||
# List of attributes stripped off the project on update. (list value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*project_allow_create*]
|
|
||||||
# Allow project creation in LDAP backend. (boolean value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*project_allow_update*]
|
|
||||||
# Allow project update in LDAP backend. (boolean value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*project_allow_delete*]
|
|
||||||
# Allow project deletion in LDAP backend. (boolean value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*project_enabled_emulation*]
|
|
||||||
# If true, Keystone uses an alternative method to determine if
|
|
||||||
# a project is enabled or not by checking if they are a member
|
|
||||||
# of the "project_enabled_emulation_dn" group. (boolean value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*project_enabled_emulation_dn*]
|
|
||||||
# DN of the group entry to hold enabled projects when using
|
|
||||||
# enabled emulation. (string value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*project_additional_attribute_mapping*]
|
|
||||||
# Additional attribute mappings for projects. Attribute
|
|
||||||
# mapping format is <ldap_attr>:<user_attr>, where ldap_attr
|
|
||||||
# is the attribute in the LDAP entry and user_attr is the
|
|
||||||
# Identity API attribute. (list value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*role_tree_dn*]
|
|
||||||
# Search base for roles. (string value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*role_filter*]
|
|
||||||
# LDAP search filter for roles. (string value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*role_objectclass*]
|
|
||||||
# LDAP objectclass for roles. (string value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*role_id_attribute*]
|
|
||||||
# LDAP attribute mapped to role id. (string value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*role_name_attribute*]
|
|
||||||
# LDAP attribute mapped to role name. (string value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*role_member_attribute*]
|
|
||||||
# LDAP attribute mapped to role membership. (string value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*role_attribute_ignore*]
|
|
||||||
# List of attributes stripped off the role on update. (list value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*role_allow_create*]
|
|
||||||
# Allow role creation in LDAP backend. (boolean value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*role_allow_update*]
|
|
||||||
# Allow role update in LDAP backend. (boolean value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*role_allow_delete*]
|
|
||||||
# Allow role deletion in LDAP backend. (boolean value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# [*role_additional_attribute_mapping*]
|
|
||||||
# Additional attribute mappings for roles. Attribute mapping
|
|
||||||
# format is <ldap_attr>:<user_attr>, where ldap_attr is the
|
|
||||||
# attribute in the LDAP entry and user_attr is the Identity
|
|
||||||
# API attribute. (list value)
|
|
||||||
# Defaults to 'undef'
|
|
||||||
#
|
|
||||||
# == Authors
|
# == Authors
|
||||||
#
|
#
|
||||||
# Dan Bode dan@puppetlabs.com
|
# Dan Bode dan@puppetlabs.com
|
||||||
@ -418,72 +299,8 @@ class keystone::ldap(
|
|||||||
$auth_pool_connection_lifetime = 60,
|
$auth_pool_connection_lifetime = 60,
|
||||||
$package_ensure = present,
|
$package_ensure = present,
|
||||||
$manage_packages = true,
|
$manage_packages = true,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$project_tree_dn = undef,
|
|
||||||
$project_filter = undef,
|
|
||||||
$project_objectclass = undef,
|
|
||||||
$project_id_attribute = undef,
|
|
||||||
$project_member_attribute = undef,
|
|
||||||
$project_desc_attribute = undef,
|
|
||||||
$project_name_attribute = undef,
|
|
||||||
$project_enabled_attribute = undef,
|
|
||||||
$project_domain_id_attribute = undef,
|
|
||||||
$project_attribute_ignore = undef,
|
|
||||||
$project_allow_create = undef,
|
|
||||||
$project_allow_update = undef,
|
|
||||||
$project_allow_delete = undef,
|
|
||||||
$project_enabled_emulation = undef,
|
|
||||||
$project_enabled_emulation_dn = undef,
|
|
||||||
$project_additional_attribute_mapping = undef,
|
|
||||||
$role_tree_dn = undef,
|
|
||||||
$role_filter = undef,
|
|
||||||
$role_objectclass = undef,
|
|
||||||
$role_id_attribute = undef,
|
|
||||||
$role_name_attribute = undef,
|
|
||||||
$role_member_attribute = undef,
|
|
||||||
$role_attribute_ignore = undef,
|
|
||||||
$role_allow_create = undef,
|
|
||||||
$role_allow_update = undef,
|
|
||||||
$role_allow_delete = undef,
|
|
||||||
$role_additional_attribute_mapping = undef,
|
|
||||||
) inherits keystone::params {
|
) inherits keystone::params {
|
||||||
|
|
||||||
$deprecated_param_names = [
|
|
||||||
'project_tree_dn',
|
|
||||||
'project_filter',
|
|
||||||
'project_objectclass',
|
|
||||||
'project_id_attribute',
|
|
||||||
'project_member_attribute',
|
|
||||||
'project_desc_attribute',
|
|
||||||
'project_name_attribute',
|
|
||||||
'project_enabled_attribute',
|
|
||||||
'project_domain_id_attribute',
|
|
||||||
'project_attribute_ignore',
|
|
||||||
'project_allow_create',
|
|
||||||
'project_allow_update',
|
|
||||||
'project_allow_delete',
|
|
||||||
'project_enabled_amulation',
|
|
||||||
'project_enabled_amulation_dn',
|
|
||||||
'project_additional_attribute_mapping',
|
|
||||||
'role_tree_dn',
|
|
||||||
'role_filter',
|
|
||||||
'role_objectclass',
|
|
||||||
'role_id_attribute',
|
|
||||||
'role_name_attribute',
|
|
||||||
'role_member_attribute',
|
|
||||||
'role_attribute_ignore',
|
|
||||||
'role_allow_create',
|
|
||||||
'role_allow_update',
|
|
||||||
'role_allow_delete',
|
|
||||||
'role_additional_attribute_mapping',
|
|
||||||
]
|
|
||||||
$deprecated_param_names.each |$param_name| {
|
|
||||||
$param = getvar($param_name)
|
|
||||||
if $param != undef {
|
|
||||||
warning("The ${param_name} is deprecated and has no effect")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
include keystone::deps
|
include keystone::deps
|
||||||
|
|
||||||
if $manage_packages {
|
if $manage_packages {
|
||||||
|
|||||||
@ -0,0 +1,33 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The following parameters of the ``keystone::ldap`` class have been removed.
|
||||||
|
|
||||||
|
- ``project_tree_dn``
|
||||||
|
- ``project_filter``
|
||||||
|
- ``project_objectclass``
|
||||||
|
- ``project_id_attribute``
|
||||||
|
- ``project_member_attribute``
|
||||||
|
- ``project_name_attribute``
|
||||||
|
- ``project_desc_attribute``
|
||||||
|
- ``project_enabled_attribute``
|
||||||
|
- ``project_domain_id_attribute``
|
||||||
|
- ``project_attribute_ignore``
|
||||||
|
- ``project_allow_create``
|
||||||
|
- ``project_allow_update``
|
||||||
|
- ``project_allow_delete``
|
||||||
|
- ``project_enabled_emulation``
|
||||||
|
- ``project_enabled_emulation_dn``
|
||||||
|
- ``project_additional_attribute_mapping``
|
||||||
|
- ``role_tree_dn``
|
||||||
|
- ``role_filter``
|
||||||
|
- ``role_objectclass``
|
||||||
|
- ``role_id_attribute``
|
||||||
|
- ``role_name_attribute``
|
||||||
|
- ``role_member_attribute``
|
||||||
|
- ``role_attribute_ignore``
|
||||||
|
- ``role_allow_create``
|
||||||
|
- ``role_allow_update``
|
||||||
|
- ``role_allow_delete``
|
||||||
|
- ``role_additional_attribute_map``
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user