From 02355504f83a459df2f23dc3f3a9126527bd02a3 Mon Sep 17 00:00:00 2001 From: Martin Magr Date: Wed, 6 May 2020 15:35:32 +0200 Subject: [PATCH] Enable collectd-ceph plugin only where needed We need to ensure that ceph plugin is enabled only on relevant nodes, otherwise it might bring whole collectd down (unlike other collectd plugins) Change-Id: I36735dc6699e957ee8903ee5a8e9f642740ea5d3 (cherry picked from commit 0b13905447d83b849c217fdd6cdff88b5e209f9e) --- deployment/ceph-ansible/ceph-mon.yaml | 5 +++++ deployment/ceph-ansible/ceph-osd.yaml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/deployment/ceph-ansible/ceph-mon.yaml b/deployment/ceph-ansible/ceph-mon.yaml index a2c1dbfc9e..e1e9bad7a0 100644 --- a/deployment/ceph-ansible/ceph-mon.yaml +++ b/deployment/ceph-ansible/ceph-mon.yaml @@ -71,6 +71,11 @@ outputs: service_name: ceph_mon upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]} post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]} + service_config_settings: + collectd: + tripleo.collectd.plugins.ceph_osd: + - ceph + collectd::plugin::ceph::daemons: [] puppet_config: config_image: '' config_volume: '' diff --git a/deployment/ceph-ansible/ceph-osd.yaml b/deployment/ceph-ansible/ceph-osd.yaml index eabf9f5f3c..c8d3af66ae 100644 --- a/deployment/ceph-ansible/ceph-osd.yaml +++ b/deployment/ceph-ansible/ceph-osd.yaml @@ -121,6 +121,11 @@ outputs: when: step|int == 2 become: true delegate_to: "{{ ceph_mon_short_bootstrap_node_name }}" + service_config_settings: + collectd: + tripleo.collectd.plugins.ceph_osd: + - ceph + collectd::plugin::ceph::daemons: [] puppet_config: config_image: '' config_volume: ''