Deprecate Ceilometer Collector on undercloud

Ceilometer Collector has been deprecated in pike release. Lets
disable it by default. ALl the data will be dispatched through
pipeline going forward.

Change-Id: I8132418636a6e9a564de16ed8c4d4bfa406c886c
Closes-bug: #1676961

elements/puppet-stack-config/puppet-stack-config.pp

@@ -160,14 +160,23 @@ class { '::heat::db::mysql':
 if str2bool(hiera('enable_telemetry', true)) {
 
   # Ceilometer
-  $ceilometer_dsn = split(hiera('ceilometer::db::database_connection'), '[@:/?]')
-  class { '::ceilometer::db::mysql':
-    user          => $ceilometer_dsn[3],
-    password      => $ceilometer_dsn[4],
-    host          => $ceilometer_dsn[5],
-    dbname        => $ceilometer_dsn[6],
-    allowed_hosts => $allowed_hosts,
+
+  if str2bool(hiera('enable_legacy_ceilometer_collector', false)) {
+    $ceilometer_dsn = split(hiera('ceilometer::db::database_connection'), '[@:/?]')
+    class { '::ceilometer::db::mysql':
+      user          => $ceilometer_dsn[3],
+      password      => $ceilometer_dsn[4],
+      host          => $ceilometer_dsn[5],
+      dbname        => $ceilometer_dsn[6],
+      allowed_hosts => $allowed_hosts,
+    }
+    include ::ceilometer::db
+    include ::ceilometer::collector
+
+    # ensure we restart ceilometer collector as well
+    Keystone::Resource::Service_identity<||> -> Service['ceilometer-collector']
   }
+
   include ::ceilometer::keystone::auth
   include ::aodh::keystone::auth
   include ::ceilometer
@@ -175,11 +184,9 @@ if str2bool(hiera('enable_telemetry', true)) {
     include ::ceilometer::api
     include ::ceilometer::wsgi::apache
   }
-  include ::ceilometer::db
   include ::ceilometer::agent::notification
   include ::ceilometer::agent::central
   include ::ceilometer::expirer
-  include ::ceilometer::collector
   include ::ceilometer::agent::auth
   include ::ceilometer::dispatcher::gnocchi
 
@@ -204,10 +211,9 @@ if str2bool(hiera('enable_telemetry', true)) {
   }
 
 # Ensure all endpoint exists and only then run the upgrade.
-# ensure we restart ceilometer collector as well
   Keystone::Resource::Service_identity<||> ->
   Openstacklib::Service_validation['gnocchi-status'] ->
-  Exec['ceilo-gnocchi-upgrade'] ~> Service['ceilometer-collector']
+  Exec['ceilo-gnocchi-upgrade']
 
   Cron <| title == 'ceilometer-expirer' |> { command =>
     "sleep $((\$(od -A n -t d -N 3 /dev/urandom) % 86400)) && ${::ceilometer::params::expirer_command}" }

elements/puppet-stack-config/puppet-stack-config.yaml.template

@@ -775,6 +775,7 @@ enable_tempest: {{ENABLE_TEMPEST}}
 enable_validations: {{ENABLE_VALIDATIONS}}
 enable_telemetry: {{ENABLE_TELEMETRY}}
 enable_legacy_ceilometer_api: {{ENABLE_LEGACY_CEILOMETER_API}}
+enable_legacy_ceilometer_collector: {{ENABLE_LEGACY_CEILOMETER_COLLECTOR}}
 enable_ui: {{ENABLE_UI}}
 enable_cinder: {{ENABLE_CINDER}}
 

instack_undercloud/undercloud.py

@@ -321,6 +321,13 @@ _opts = [
                       'removed in future release. Please consider moving to '
                       'gnocchi/Aodh/Panko API instead.')
                 ),
+    cfg.BoolOpt('enable_legacy_ceilometer_collector',
+                default=False,
+                help=('Whether to enable legacy ceilometer collector '
+                      'in the Undercloud. '
+                      'Note: Ceilometer collector has been deprecated and '
+                      'will be removed in future release.')
+                ),
     cfg.BoolOpt('enable_novajoin',
                 default=False,
                 help=('Whether to install novajoin metadata service in '

releasenotes/notes/disable-ceilometer-collector-64bbcbe58b122721.yaml

@@ -0,0 +1,6 @@
+---
+deprecations:
+  - Ceilometer collector service is deprecated in pike release.
+fixes:
+  - Disable ceilometer collector by default as its deprecated. All the
+    data will now be dispatched through pipeline directly.

undercloud.conf.sample

@@ -173,6 +173,12 @@
 # (boolean value)
 #enable_legacy_ceilometer_api = false
 
+# Whether to enable legacy ceilometer collector in the Undercloud. Note:
+# Ceilometer collector has been deprecated and will be removed in future
+# release.
+# (boolean value)
+#enable_legacy_ceilometer_collector = false
+
 # Whether to install novajoin metadata service in the Undercloud.
 # (boolean value)
 #enable_novajoin = false