Drop legacy ceilometer collector

Collector was moved to legacy mode in pike and
not supported anymore. Lets drop collector
starting queens.

Change-Id: I952103e39f63d278988a73035d7194b9e351ad31
This commit is contained in:
Pradeep Kilambi 2017-09-27 12:09:49 -04:00
parent 52cb07dd06
commit da02a5e748
5 changed files with 5 additions and 32 deletions

View File

@ -165,22 +165,6 @@ if str2bool(hiera('enable_telemetry', false)) {
# Ceilometer
if str2bool(hiera('enable_legacy_ceilometer_collector', false)) {
$ceilometer_dsn = match(hiera('ceilometer::db::database_connection'), $re_dsn)
class { '::ceilometer::db::mysql':
user => $ceilometer_dsn[1],
password => $ceilometer_dsn[2],
host => $ceilometer_dsn[3],
dbname => $ceilometer_dsn[4],
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

View File

@ -303,15 +303,12 @@ ceilometer::keystone::auth::internal_url: {{UNDERCLOUD_ENDPOINT_CEILOMETER_INTER
ceilometer::keystone::auth::admin_url: {{UNDERCLOUD_ENDPOINT_CEILOMETER_ADMIN}}
ceilometer::keystone::auth::password: {{UNDERCLOUD_CEILOMETER_PASSWORD}}
ceilometer::keystone::auth::region: "%{hiera('keystone_region')}"
# gnocchi dispatcher config
ceilometer::collector::meter_dispatcher: 'gnocchi'
ceilometer::dispatcher::gnocchi::url: {{UNDERCLOUD_ENDPOINT_GNOCCHI_INTERNAL}}
ceilometer::dispatcher::gnocchi::filter_project: 'service'
ceilometer::dispatcher::gnocchi::archive_policy: 'low'
ceilometer::dispatcher::gnocchi::resources_definition_file: 'gnocchi_resources.yaml'
# events dispatcher config
ceilometer::collector::event_dispatcher: ['panko', 'gnocchi']
ceilometer::agent::notification::event_pipeline_publishers: ['gnocchi://', 'panko://']
ceilometer::agent::notification::manage_event_pipeline: true
@ -833,7 +830,6 @@ 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}}
enable_container_images_build: {{ENABLE_CONTAINER_IMAGES_BUILD}}

View File

@ -336,13 +336,6 @@ _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 '

View File

@ -0,0 +1,5 @@
---
fixes:
- |
Drop ceilometer collector from undercloud. This was moved into legacy mode
in Pike and deprecated.

View File

@ -178,11 +178,6 @@
# (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