From 3b9fdf995236c857043e4e8e0c1ca65038daeb63 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 8 Apr 2019 15:57:30 +0100 Subject: [PATCH] Don't enable grafana when monasca is enabled If you enable monasca via kolla_enable_monasca, grafana is automatically enabled too. Monasca provides its own forked version of grafana, so we don't need the standard one. This change brings the logic into line with kolla-ansible. Change-Id: I5be1f269547d9c547211b675814829a665685485 Story: 2005399 Task: 30393 --- ansible/group_vars/all/kolla | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla index 126a8a63b..4e0f83d5c 100644 --- a/ansible/group_vars/all/kolla +++ b/ansible/group_vars/all/kolla @@ -342,7 +342,7 @@ kolla_enable_elasticsearch: "{{ 'yes' if kolla_enable_central_logging | bool or kolla_enable_etcd: "no" kolla_enable_freezer: "no" kolla_enable_glance: "yes" -kolla_enable_grafana: "{{ 'yes' if kolla_enable_monasca | bool else 'no' }}" +kolla_enable_grafana: "no" kolla_enable_gnocchi: "no" kolla_enable_haproxy: "yes" kolla_enable_heat: "yes"