From abc123dc6d834d7ba2ee5771ede5e43a6dbd684e Mon Sep 17 00:00:00 2001 From: Will Foster Date: Tue, 14 Jun 2016 15:02:24 +0100 Subject: [PATCH] Change conditional "or" instead of "and" for Grafana var check. We want to force users to enter ip addresses for both graphite_host and grafana_host, but using "and" catches scenarios when both variables were missing. Changing this conditional to "or" will catch scenarios where one or the other might be missing too. Patchset #1: change "and" to "or" Patchset #2: minor commit description correction Patchset #3: wrap commit comments cleaner Change-Id: Ic0553a398c491ba414b194b8a330ea2b04a6eb44 --- ansible/install/roles/grafana/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/install/roles/grafana/tasks/main.yml b/ansible/install/roles/grafana/tasks/main.yml index cf67ba45e..5f9f18543 100644 --- a/ansible/install/roles/grafana/tasks/main.yml +++ b/ansible/install/roles/grafana/tasks/main.yml @@ -7,7 +7,7 @@ - name: Check Graphite/Grafana Host IP Address fail: msg="** Edit grafana_host and graphite_host in ../install/group_vars/all.yml before running **" - when: ((grafana_host is none) and (graphite_host is none)) + when: ((grafana_host is none) or (graphite_host is none)) - name: Import EPEL GPG Key rpm_key: key=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7