From 0868278dd32864807b82e4a1c33f52d04f73dbcc Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Tue, 5 Dec 2017 12:25:33 +0100 Subject: [PATCH] ansible: Always configure graphite and carbon cache In the meantime, we need this for event logging (alert status). Signed-off-by: Boris Ranto --- ansible/roles/ceph-collectd/tasks/configure_collectd.yml | 2 -- ansible/roles/ceph-collectd/tasks/install_packages.yml | 2 +- ansible/roles/ceph-grafana/tasks/main.yml | 2 -- ansible/roles/ceph-grafana/tasks/start_services.yml | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ansible/roles/ceph-collectd/tasks/configure_collectd.yml b/ansible/roles/ceph-collectd/tasks/configure_collectd.yml index a8e04f0..4ea7819 100644 --- a/ansible/roles/ceph-collectd/tasks/configure_collectd.yml +++ b/ansible/roles/ceph-collectd/tasks/configure_collectd.yml @@ -30,7 +30,6 @@ dest: "{{ collectd_conf_d }}/write_graphite.conf" regexp: 'Host ".*"' replace: "Host \"{{ groups['ceph-grafana'][0] }}\"" - when: backend == 'graphite' notify: Restart collectd - name: Set cluster name in cephmetrics.conf @@ -46,7 +45,6 @@ regexp: 'EventURL ".*"' insertafter: 'ClusterName ".*"' line: " EventURL \"http://{{ groups['ceph-grafana'][0] }}:{{ graphite.web_port if graphite.service == 'graphite-web' else graphite.api_port }}/events/\"" - when: backend == 'graphite' notify: Restart collectd - name: Set ModulePath in cephmetrics.conf diff --git a/ansible/roles/ceph-collectd/tasks/install_packages.yml b/ansible/roles/ceph-collectd/tasks/install_packages.yml index 2059e5e..1f98141 100644 --- a/ansible/roles/ceph-collectd/tasks/install_packages.yml +++ b/ansible/roles/ceph-collectd/tasks/install_packages.yml @@ -19,7 +19,7 @@ - name: Install collectd-write_prometheus package: - name: collectd-python + name: collectd-write_prometheus state: latest when: - backend == "prometheus" diff --git a/ansible/roles/ceph-grafana/tasks/main.yml b/ansible/roles/ceph-grafana/tasks/main.yml index 1706f4e..ba0ff3f 100644 --- a/ansible/roles/ceph-grafana/tasks/main.yml +++ b/ansible/roles/ceph-grafana/tasks/main.yml @@ -25,14 +25,12 @@ - include: configure_carbon.yml when: - - backend == "graphite" - not containerized_deployment tags: - carbon - include: configure_graphite.yml when: - - backend == "graphite" - not containerized_deployment tags: - graphite diff --git a/ansible/roles/ceph-grafana/tasks/start_services.yml b/ansible/roles/ceph-grafana/tasks/start_services.yml index b2006f5..32dbd27 100644 --- a/ansible/roles/ceph-grafana/tasks/start_services.yml +++ b/ansible/roles/ceph-grafana/tasks/start_services.yml @@ -9,7 +9,6 @@ # graphite-web is served by apache - "{{ graphite.apache_name[ansible_pkg_mgr] }}" - grafana-server - when: backend == "graphite" - name: Enable and start services (prometheus) service: -- 2.47.3