x/browbeat
Code Issues Proposed changes

Change conditional "or" instead of "and" for Grafana var check.

Browse Source 
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
This commit is contained in:
Will Foster 2016-06-14 15:02:24 +01:00
parent 06e3e3292b
commit abc123dc6d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/install/roles/grafana/tasks/main.yml
View File

@ -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