Merge "Remove deprecated service_provider parameter"

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')
   }

releasenotes/notes/remove-deprecated-service_provider-9f29158cb5bc9583.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The deprecated keystone::service_provider parameter is now removed.