Merge "Deprecate keystone::service"

manifests/init.pp

@@ -632,12 +632,13 @@ class keystone(
       $::keystone::params::service_name: {
         $service_name_real = $::keystone::params::service_name
 
-        class { 'keystone::service':
-          ensure       => $service_ensure,
-          service_name => $service_name,
-          enable       => $enabled,
-          hasstatus    => true,
-          hasrestart   => true,
+        service { 'keystone':
+          ensure     => $service_ensure,
+          name       => $service_name,
+          enable     => $enabled,
+          hasstatus  => true,
+          hasrestart => true,
+          tag        => 'keystone-service',
         }
 
         # Note: Debian uses uwsgi if using keystone service, which isn't deprecated

manifests/service.pp

@@ -1,5 +1,6 @@
 # == Class keystone::service
 #
+# DEPRECATED !!
 # Encapsulates the keystone service to a class.
 #
 # === Parameters
@@ -34,6 +35,8 @@ class keystone::service (
 
   include keystone::deps
 
+  warning('The keystone::service class is deprecated and will be removed in a future release,')
+
   service { 'keystone':
     ensure     => $ensure,
     name       => $service_name,

releasenotes/notes/deprecate-keystone-service-980e93e5908d24eb.yaml

@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    The ``keystone::service`` class has been deprecated and will be removed
+    in a future release.