From a156f689ab1fe5e41b293ab67398a20f22398e80 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 19 Aug 2021 20:47:57 +0900
Subject: [PATCH] Deprecate support for ceilometer_client/api_version

... because the parameter was already deprecated in Watcher[1].

[1] 92894237f3514365ee1aea31579afe47254ccd11

Change-Id: I443432c6bc92673bd9b2607272ecc4257fc5d444
---
 manifests/init.pp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 8f82256..bf62608 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,10 +8,6 @@
 #   (required) Enable SSL on the API server.
 #   Defaults to false.
 #
-# [*ceilometer_client_api_version*]
-#   (required) Version of Ceilometer API to use in ceilometerclient.
-#   Default is 2.
-#
 # [*cinder_client_api_version*]
 #   (required) Version of Cinder API to use in cinderclient.
 #   Default is 3.
@@ -234,6 +230,10 @@
 #   (Optional) Accept clients using either SSL or plain TCP.
 #   Defaults to undef.
 #
+# [*ceilometer_client_api_version*]
+#   (required) Version of Ceilometer API to use in ceilometerclient.
+#   Default is undef
+#
 # === Authors
 #
 # Daniel Pawlik  <daniel.pawlik@corp.ovh.com>
@@ -241,7 +241,6 @@
 class watcher (
   $purge_config                         = false,
   $use_ssl                              = false,
-  $ceilometer_client_api_version        = '2',
   $cinder_client_api_version            = '3',
   $glance_client_api_version            = '2',
   $neutron_client_api_version           = '2',
@@ -291,6 +290,7 @@ class watcher (
   $notification_topics                  = $::os_service_default,
   # DEPRECATED PARAMETERS
   $amqp_allow_insecure_clients          = undef,
+  $ceilometer_client_api_version        = undef,
 ) {
 
   include openstacklib::openstackclient
@@ -305,6 +305,10 @@ class watcher (
 will be removed in a future release.')
   }
 
+  if $ceilometer_client_api_version != undef {
+    warning('The ceilometer_client_api_version parameter is deprecated and has no effect')
+  }
+
   package { 'watcher':
     ensure => $package_ensure,
     name   => $::watcher::params::common_package_name,
@@ -316,11 +320,10 @@ will be removed in a future release.')
   }
 
   watcher_config {
-    'ceilometer_client/api_version': value => $ceilometer_client_api_version;
-    'cinder_client/api_version':     value => $cinder_client_api_version;
-    'glance_client/api_version':     value => $glance_client_api_version;
-    'neutron_client/api_version':    value => $neutron_client_api_version;
-    'nova_client/api_version':       value => $nova_client_api_version;
+    'cinder_client/api_version':  value => $cinder_client_api_version;
+    'glance_client/api_version':  value => $glance_client_api_version;
+    'neutron_client/api_version': value => $neutron_client_api_version;
+    'nova_client/api_version':    value => $nova_client_api_version;
   }
 
   oslo::messaging::rabbit { 'watcher_config':