Deprecate client class

The python-keystoneclient package removed CLI long ago so installing
the package is now useless. It provides only library implementations
and should be installed by package dependencies.

Change-Id: I46b09092847eeb821f97172e1a912ad8a1b8a2e3

manifests/client.pp

@@ -19,6 +19,9 @@ class keystone::client (
 
   include keystone::deps
 
+  warning("The keystone::client class has been deprecated and will be removed \
+in a future release.")
+
   package { 'python-keystoneclient':
     ensure => $ensure,
     name   => $client_package_name,

manifests/init.pp

@@ -8,11 +8,6 @@
 #   accepts latest or specific versions.
 #   Defaults to present.
 #
-# [*client_package_ensure*]
-#   (Optional) Desired ensure state of the client package.
-#   accepts latest or specific versions.
-#   Defaults to present.
-#
 # [*catalog_driver*]
 #   (Optional) Catalog driver used by Keystone to store endpoints and services.
 #   Defaults to false.
@@ -329,6 +324,11 @@
 #   This accepts sql or template.
 #   Defaults to undef.
 #
+# [*client_package_ensure*]
+#   (Optional) Desired ensure state of the client package.
+#   accepts latest or specific versions.
+#   Defaults to present.
+#
 # == Authors
 #
 #   Dan Bode dan@puppetlabs.com
@@ -339,7 +339,6 @@
 #
 class keystone(
   $package_ensure                       = 'present',
-  $client_package_ensure                = 'present',
   $catalog_driver                       = false,
   $catalog_template_file                = '/etc/keystone/default_catalog.templates',
   $token_provider                       = 'fernet',
@@ -396,6 +395,7 @@ class keystone(
   $amqp_durable_queues                  = $facts['os_service_default'],
   # DEPRECATED PARAMETERS
   $catalog_type                         = undef,
+  $client_package_ensure                = undef,
 ) inherits keystone::params {
 
   include keystone::deps
@@ -417,6 +417,10 @@ class keystone(
     }
   }
 
+  if $client_package_ensure != undef {
+    warning('The client_package_ensure parameter is deprecated and has no effect.')
+  }
+
   if $manage_policyrcd {
     # openstacklib policy_rcd only affects debian based systems.
     Policy_rcd <| title == 'keystone' |> -> Package['keystone']
@@ -437,13 +441,7 @@ class keystone(
     name   => $::keystone::params::package_name,
     tag    => ['openstack', 'keystone-package'],
   }
-  if $client_package_ensure == 'present' {
-    include keystone::client
-  } else {
-    class { 'keystone::client':
-      ensure => $client_package_ensure,
-    }
-  }
+  include openstacklib::openstackclient
 
   resources { 'keystone_config':
     purge  => $purge_config,

releasenotes/notes/deprecate-client-09e5876938d3a374.yaml

@@ -0,0 +1,10 @@
+---
+deprecations:
+  - |
+    The ``keystone::client_package_ensure`` parameter has been deprecated and
+    has no effect.
+
+  - |
+    The ``keystone::client`` class has been deprecated, because
+    the python-keystoneclient package no longer provides CLI. Use
+    the ``openstacklib::openstackclient`` class instead.

spec/classes/keystone_init_spec.rb

@@ -15,9 +15,7 @@ describe 'keystone' do
         :tag    => ['openstack', 'keystone-package'],
       ) }
 
-      it { is_expected.to contain_class('keystone::client').with(
-        'ensure' => 'present'
-      ) }
+      it { is_expected.to contain_class('openstacklib::openstackclient') }
 
       it 'should synchronize the db if $sync_db is true' do
         is_expected.to contain_exec('keystone-manage db_sync').with(