From f349eb8445e59d98320b6a0c11d4ed92aaad2bf9 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Fri, 7 Dec 2018 09:29:32 +0800
Subject: [PATCH] Remove module_plugins

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

Change-Id: Ic9021344d48f036724403529ecbea467be58b964
---
 manifests/federation/mellon.pp                            | 6 ------
 manifests/federation/openidc.pp                           | 7 -------
 manifests/federation/shibboleth.pp                        | 8 --------
 .../remove-deprecated-module_plugin-2a8159de7e119dda.yaml | 6 ++++++
 4 files changed, 6 insertions(+), 21 deletions(-)
 create mode 100644 releasenotes/notes/remove-deprecated-module_plugin-2a8159de7e119dda.yaml

diff --git a/manifests/federation/mellon.pp b/manifests/federation/mellon.pp
index 69f40a4e1..f6dce51c4 100644
--- a/manifests/federation/mellon.pp
+++ b/manifests/federation/mellon.pp
@@ -48,11 +48,6 @@
 #
 # === 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*]
 #   (optional) URL list of trusted horizon servers.
 #   This setting ensures that keystone only sends token data back to trusted
@@ -73,7 +68,6 @@ class keystone::federation::mellon (
   $enable_websso      = false,
   # DEPRECATED
   $trusted_dashboards = undef,
-  $module_plugin      = undef,
 ) {
 
   include ::apache
diff --git a/manifests/federation/openidc.pp b/manifests/federation/openidc.pp
index 537a39531..35a0da02c 100644
--- a/manifests/federation/openidc.pp
+++ b/manifests/federation/openidc.pp
@@ -70,11 +70,6 @@
 # [*keystone_admin_url*]
 #    (optional) URL to keystone admin endpoint.
 #
-# === DEPRECATED
-#
-# [*module_plugin*]
-#  This value is no longer used.
-#
 class keystone::federation::openidc (
   $methods,
   $idp_name,
@@ -90,8 +85,6 @@ class keystone::federation::openidc (
   $package_ensure              = present,
   $keystone_public_url         = undef,
   $keystone_admin_url          = undef,
-  # DEPRECATED
-  $module_plugin               = undef,
 ) {
 
   include ::apache
diff --git a/manifests/federation/shibboleth.pp b/manifests/federation/shibboleth.pp
index 27d02f6b1..7658d1331 100644
--- a/manifests/federation/shibboleth.pp
+++ b/manifests/federation/shibboleth.pp
@@ -47,12 +47,6 @@
 #      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
 #    According to puppet-apache we need to enable a new repo, but in puppet-openstack
 #    we won't enable any external third party repo.
@@ -66,8 +60,6 @@ class keystone::federation::shibboleth(
   $suppress_warning = false,
   $template_order   = 331,
   $yum_repo_name    = 'shibboleth',
-  # DEPRECATED
-  $module_plugin    = undef,
 ) {
 
   include ::apache
diff --git a/releasenotes/notes/remove-deprecated-module_plugin-2a8159de7e119dda.yaml b/releasenotes/notes/remove-deprecated-module_plugin-2a8159de7e119dda.yaml
new file mode 100644
index 000000000..730ab9670
--- /dev/null
+++ b/releasenotes/notes/remove-deprecated-module_plugin-2a8159de7e119dda.yaml
@@ -0,0 +1,6 @@
+---
+deprecations:
+  - |
+    keystone::federation::mellon::module_plugin,
+    keystone::federation::shibboleth::module_plugin,
+    keystone::federation::openidc::module_plugin have been removed.