From 18998f28763a8e95a0caeca934d997b38c60d4b6 Mon Sep 17 00:00:00 2001 From: Mark Giles Date: Fri, 8 Jun 2018 13:14:36 -0400 Subject: [PATCH] Fix enabled state for some prometheus services Some services were enabled by default which, even though they were never deployed when prometheus wasn't enabled, could cause problems if the monitoring inventory group was empty. Changed these services to be enabled based on whether prometheus is enabled. Change-Id: I0956a1b65a3577cd57fe3b16a95bc3d64fc142ba --- ansible/group_vars/all.yml | 4 ++-- etc/kolla/globals.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 63fc13a989..99386df044 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -819,6 +819,6 @@ use_common_mariadb_user: "no" ############ enable_prometheus_haproxy_exporter: "{{ enable_haproxy | bool }}" enable_prometheus_mysqld_exporter: "{{ enable_mariadb | bool }}" -enable_prometheus_node_exporter: "yes" +enable_prometheus_node_exporter: "{{ enable_prometheus | bool }}" enable_prometheus_memcached_exporter: "{{ enable_memcached | bool }}" -enable_prometheus_cadvisor: "yes" +enable_prometheus_cadvisor: "{{ enable_prometheus | bool }}" diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 0b296d8e12..7ac8428700 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -457,5 +457,5 @@ tempest_floating_network_name: ############ #enable_prometheus_haproxy_exporter: "{{ enable_haproxy | bool }}" #enable_prometheus_mysqld_exporter: "{{ enable_mariadb | bool }}" -#enable_prometheus_node_exporter: "yes" -#enable_prometheus_cadvisor: "yes" +#enable_prometheus_node_exporter: "{{ enable_prometheus | bool }}" +#enable_prometheus_cadvisor: "{{ enable_prometheus | bool }}"