x/browbeat
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2016-06-14 16:00:48 +00:00 committed by Gerrit Code Review
commit 3fe699c8ac
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 - name: Check Graphite/Grafana Host IP Address
fail: fail:
msg="** Edit grafana_host and graphite_host in ../install/group_vars/all.yml before running **" 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 - name: Import EPEL GPG Key
rpm_key: key=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 rpm_key: key=https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7