summaryrefslogtreecommitdiffstats
path: root/playbooks/adhoc
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-07-29 09:49:46 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-07-29 09:49:46 -0400
commit1c1e57e6d24a7430651caa87c52b9b22ea96132d (patch)
tree39fae14992f57a97899555726b6f462549da5612 /playbooks/adhoc
parent8cc43c50d6aae70522c72396512ec52359cf236b (diff)
parent276225820663090e8b88a9c2c6974e9f66c8632f (diff)
downloadopenshift-1c1e57e6d24a7430651caa87c52b9b22ea96132d.tar.gz
openshift-1c1e57e6d24a7430651caa87c52b9b22ea96132d.tar.bz2
openshift-1c1e57e6d24a7430651caa87c52b9b22ea96132d.tar.xz
openshift-1c1e57e6d24a7430651caa87c52b9b22ea96132d.zip
Merge pull request #402 from twiest/pr
added roles symlink for zabbix_setup, fixed URL to work with ZAIO instead of a test cluster instance.
Diffstat (limited to 'playbooks/adhoc')
-rw-r--r--playbooks/adhoc/zabbix_setup/clean_zabbix.yml4
l---------playbooks/adhoc/zabbix_setup/roles1
-rw-r--r--playbooks/adhoc/zabbix_setup/setup_zabbix.yml4
3 files changed, 7 insertions, 2 deletions
diff --git a/playbooks/adhoc/zabbix_setup/clean_zabbix.yml b/playbooks/adhoc/zabbix_setup/clean_zabbix.yml
index bd71e6d1d..610d18b28 100644
--- a/playbooks/adhoc/zabbix_setup/clean_zabbix.yml
+++ b/playbooks/adhoc/zabbix_setup/clean_zabbix.yml
@@ -2,7 +2,9 @@
- hosts: localhost
gather_facts: no
vars:
- g_zserver: http://oso-rhel7-zabbix-web.kwoodsontest2.opstest.online.openshift.com/zabbix/api_jsonrpc.php
+ # Use this for local ZAIO
+ g_zserver: http://localhost/zabbix/api_jsonrpc.php
+
g_zuser: Admin
g_zpassword: zabbix
roles:
diff --git a/playbooks/adhoc/zabbix_setup/roles b/playbooks/adhoc/zabbix_setup/roles
new file mode 120000
index 000000000..e2b799b9d
--- /dev/null
+++ b/playbooks/adhoc/zabbix_setup/roles
@@ -0,0 +1 @@
+../../../roles/ \ No newline at end of file
diff --git a/playbooks/adhoc/zabbix_setup/setup_zabbix.yml b/playbooks/adhoc/zabbix_setup/setup_zabbix.yml
index 286f699e5..8b44f2adf 100644
--- a/playbooks/adhoc/zabbix_setup/setup_zabbix.yml
+++ b/playbooks/adhoc/zabbix_setup/setup_zabbix.yml
@@ -5,7 +5,9 @@
- vars/template_heartbeat.yml
- vars/template_os_linux.yml
vars:
- g_zserver: http://oso-rhel7-zabbix-web.kwoodsontest2.opstest.online.openshift.com/zabbix/api_jsonrpc.php
+ # Use this for local ZAIO
+ g_zserver: http://localhost/zabbix/api_jsonrpc.php
+
g_zuser: Admin
g_zpassword: zabbix
roles: