Remove module_plugins

Remove the deprecated module_plugin option which has been deprecated
for on years.

Change-Id: Ic9021344d48f036724403529ecbea467be58b964
This commit is contained in:
ZhongShengping 2018-12-07 09:29:32 +08:00
parent 9be16e4114
commit f349eb8445
4 changed files with 6 additions and 21 deletions

View File

@ -48,11 +48,6 @@
# #
# === DEPRECATED # === DEPRECATED
# #
# [*module_plugin*]
# The plugin for authentication acording to the choice made with protocol and
# module.
# (Optional) Defaults to 'keystone.auth.plugins.mapped.Mapped' (string value)
#
# [*trusted_dashboards*] # [*trusted_dashboards*]
# (optional) URL list of trusted horizon servers. # (optional) URL list of trusted horizon servers.
# This setting ensures that keystone only sends token data back to trusted # This setting ensures that keystone only sends token data back to trusted
@ -73,7 +68,6 @@ class keystone::federation::mellon (
$enable_websso = false, $enable_websso = false,
# DEPRECATED # DEPRECATED
$trusted_dashboards = undef, $trusted_dashboards = undef,
$module_plugin = undef,
) { ) {
include ::apache include ::apache

View File

@ -70,11 +70,6 @@
# [*keystone_admin_url*] # [*keystone_admin_url*]
# (optional) URL to keystone admin endpoint. # (optional) URL to keystone admin endpoint.
# #
# === DEPRECATED
#
# [*module_plugin*]
# This value is no longer used.
#
class keystone::federation::openidc ( class keystone::federation::openidc (
$methods, $methods,
$idp_name, $idp_name,
@ -90,8 +85,6 @@ class keystone::federation::openidc (
$package_ensure = present, $package_ensure = present,
$keystone_public_url = undef, $keystone_public_url = undef,
$keystone_admin_url = undef, $keystone_admin_url = undef,
# DEPRECATED
$module_plugin = undef,
) { ) {
include ::apache include ::apache

View File

@ -47,12 +47,6 @@
# require => Anchor['openstack_extras_redhat'] # require => Anchor['openstack_extras_redhat']
# } # }
# #
# === DEPRECATED
# [*module_plugin*]
# The plugin for authentication according to the choice made with protocol and
# module.
# (Optional) Defaults to 'keystone.auth.plugins.mapped.Mapped' (string value)
#
# == Note about Redhat osfamily # == Note about Redhat osfamily
# According to puppet-apache we need to enable a new repo, but in puppet-openstack # According to puppet-apache we need to enable a new repo, but in puppet-openstack
# we won't enable any external third party repo. # we won't enable any external third party repo.
@ -66,8 +60,6 @@ class keystone::federation::shibboleth(
$suppress_warning = false, $suppress_warning = false,
$template_order = 331, $template_order = 331,
$yum_repo_name = 'shibboleth', $yum_repo_name = 'shibboleth',
# DEPRECATED
$module_plugin = undef,
) { ) {
include ::apache include ::apache

View File

@ -0,0 +1,6 @@
---
deprecations:
- |
keystone::federation::mellon::module_plugin,
keystone::federation::shibboleth::module_plugin,
keystone::federation::openidc::module_plugin have been removed.