From dfb75a3cf6a5e4349816d1c1a341933885d24e0a Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias@busybox.se>
Date: Fri, 27 Apr 2018 09:16:35 +0200
Subject: [PATCH] Remove deprecated service_provider parameter

This parameter has been deprecated for two years
and does nothing. Lets remove it.

Change-Id: I3416b68edb0dfaa4f8c291f756c28260dc7d364d
---
 manifests/init.pp                                        | 9 ---------
 ...ove-deprecated-service_provider-9f29158cb5bc9583.yaml | 4 ++++
 2 files changed, 4 insertions(+), 9 deletions(-)
 create mode 100644 releasenotes/notes/remove-deprecated-service_provider-9f29158cb5bc9583.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index c9f5a1184..e9659141b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -573,9 +573,6 @@
 #
 # === DEPRECATED PARAMETERS
 #
-# [*service_provider*]
-#   (optional) Deprecated. Provider, that can be used for keystone service.
-#
 # [*enable_pki_setup*]
 #   (optional) Deprecated. Enable call to pki_setup to generate the cert for signing pki tokens and
 #   revocation lists if it doesn't already exist. This generates a cert and key stored in file
@@ -746,7 +743,6 @@ class keystone(
   # DEPRECATED PARAMETERS
   $admin_workers                        = $::os_workers,
   $public_workers                       = $::os_workers,
-  $service_provider                     = undef,
   $enable_pki_setup                     = undef,
   $signing_certfile                     = $::os_service_default,
   $signing_keyfile                      = $::os_service_default,
@@ -760,11 +756,6 @@ class keystone(
   include ::keystone::logging
   include ::keystone::policy
 
-  if $service_provider {
-    warning("service_provider is deprecated, does nothing and will be removed in a future release, \
-use a Puppet resource collector if you want to modify the service provider.")
-  }
-
   if ! $catalog_driver {
     validate_re($catalog_type, 'template|sql')
   }
diff --git a/releasenotes/notes/remove-deprecated-service_provider-9f29158cb5bc9583.yaml b/releasenotes/notes/remove-deprecated-service_provider-9f29158cb5bc9583.yaml
new file mode 100644
index 000000000..e6339ea60
--- /dev/null
+++ b/releasenotes/notes/remove-deprecated-service_provider-9f29158cb5bc9583.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The deprecated keystone::service_provider parameter is now removed.