Merge "Fix enabled state for some prometheus services"

This commit is contained in:
Zuul 2018-06-11 06:40:13 +00:00 committed by Gerrit Code Review
commit f9954afdba
2 changed files with 4 additions and 4 deletions

View File

@ -819,6 +819,6 @@ use_common_mariadb_user: "no"
############ ############
enable_prometheus_haproxy_exporter: "{{ enable_haproxy | bool }}" enable_prometheus_haproxy_exporter: "{{ enable_haproxy | bool }}"
enable_prometheus_mysqld_exporter: "{{ enable_mariadb | 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_memcached_exporter: "{{ enable_memcached | bool }}"
enable_prometheus_cadvisor: "yes" enable_prometheus_cadvisor: "{{ enable_prometheus | bool }}"

View File

@ -457,5 +457,5 @@ tempest_floating_network_name:
############ ############
#enable_prometheus_haproxy_exporter: "{{ enable_haproxy | bool }}" #enable_prometheus_haproxy_exporter: "{{ enable_haproxy | bool }}"
#enable_prometheus_mysqld_exporter: "{{ enable_mariadb | bool }}" #enable_prometheus_mysqld_exporter: "{{ enable_mariadb | bool }}"
#enable_prometheus_node_exporter: "yes" #enable_prometheus_node_exporter: "{{ enable_prometheus | bool }}"
#enable_prometheus_cadvisor: "yes" #enable_prometheus_cadvisor: "{{ enable_prometheus | bool }}"