From 12766ddf3f1a387da80960635c44273db51573ff Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotjagov Date: Wed, 7 Nov 2018 14:09:13 +0200 Subject: [PATCH] _ceilometer_enabled defaults based on services existence Previously common checks were used in group_vars, and they were checking if ceilometer exists. But ceilometer doesn't have such group_var. As a result service thought, that ceilometer is enabled, and was sending notifications to message queue. These messages were accumulating, as the consumer was absent and knew nothing about this service and it's queue. Now this situation should be fixed. Change-Id: I29b7f679eed1249f5367c42a2898804f1a436cbc --- defaults/main.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index b2b162d1..7258bfd9 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -201,16 +201,16 @@ ceilometer_notification_workers_max: 16 ceilometer_notification_workers: "{{ [[ansible_processor_vcpus|default(2) // 2, 1] | max, ceilometer_notification_workers_max] | min }}" # Enable/Disable Ceilometer per service -cinder_ceilometer_enabled: false -designate_ceilometer_enabled: false -glance_ceilometer_enabled: false -heat_ceilometer_enabled: false -keystone_ceilometer_enabled: false -neutron_ceilometer_enabled: false -nova_ceilometer_enabled: false -sahara_ceilometer_enabled: false -swift_ceilometer_enabled: false -trove_ceilometer_enabled: false +cinder_ceilometer_enabled: "{{ (groups['cinder_all'] is defined) and (groups['cinder_all'] | length > 0) }}" +designate_ceilometer_enabled: "{{ (groups['designate_all'] is defined) and (groups['designate_all'] | length > 0) }}" +glance_ceilometer_enabled: "{{ (groups['glance_all'] is defined) and (groups['glance_all'] | length > 0) }}" +heat_ceilometer_enabled: "{{ (groups['heat_all'] is defined) and (groups['heat_all'] | length > 0) }}" +keystone_ceilometer_enabled: "{{ (groups['keystone_all'] is defined) and (groups['keystone_all'] | length > 0) }}" +neutron_ceilometer_enabled: "{{ (groups['neutron_all'] is defined) and (groups['neutron_all'] | length > 0) }}" +nova_ceilometer_enabled: "{{ (groups['nova_all'] is defined) and (groups['nova_all'] | length > 0) }}" +sahara_ceilometer_enabled: "{{ (groups['sahara_all'] is defined) and (groups['sahara_all'] | length > 0) }}" +swift_ceilometer_enabled: "{{ (groups['swift_all'] is defined) and (groups['swift_all'] | length > 0) }}" +trove_ceilometer_enabled: "{{ (groups['trove_all'] is defined) and (groups['trove_all'] | length > 0) }}" # Enable/Disable Telemetry partner services in Ceilometer # Defaults to True if the service is deployed.