summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-04-07 22:34:00 -0400
committerJason DeTiberus <jdetiber@redhat.com>2015-04-08 13:07:04 -0400
commitb167f7b3c4082a3d990aabeb10faac888e7172b3 (patch)
tree16e261e154f9a4e7b190a45c93cf9c65953282a3
parent7fd9fa19767556eb948b58717db110ee5d5253f9 (diff)
downloadopenshift-b167f7b3c4082a3d990aabeb10faac888e7172b3.tar.gz
openshift-b167f7b3c4082a3d990aabeb10faac888e7172b3.tar.bz2
openshift-b167f7b3c4082a3d990aabeb10faac888e7172b3.tar.xz
openshift-b167f7b3c4082a3d990aabeb10faac888e7172b3.zip
move zbxapi module to a new os_zabbix role
- cleans up repo root a bit
-rw-r--r--playbooks/adhoc/noc/get_zabbix_problems.yml4
l---------playbooks/adhoc/noc/library1
l---------playbooks/adhoc/noc/roles1
-rwxr-xr-xroles/os_zabbix/library/zbxapi.py (renamed from library/zbxapi.py)0
4 files changed, 4 insertions, 2 deletions
diff --git a/playbooks/adhoc/noc/get_zabbix_problems.yml b/playbooks/adhoc/noc/get_zabbix_problems.yml
index 6ac5cdcf7..02bffc1d2 100644
--- a/playbooks/adhoc/noc/get_zabbix_problems.yml
+++ b/playbooks/adhoc/noc/get_zabbix_problems.yml
@@ -2,7 +2,9 @@
- name: 'Get current hosts who have triggers that are alerting by trigger description'
hosts: localhost
gather_facts: no
- tasks:
+ roles:
+ - os_zabbix
+ post_tasks:
- assert:
that: oo_desc is defined
diff --git a/playbooks/adhoc/noc/library b/playbooks/adhoc/noc/library
deleted file mode 120000
index ba40d2f56..000000000
--- a/playbooks/adhoc/noc/library
+++ /dev/null
@@ -1 +0,0 @@
-../../../library \ No newline at end of file
diff --git a/playbooks/adhoc/noc/roles b/playbooks/adhoc/noc/roles
new file mode 120000
index 000000000..20c4c58cf
--- /dev/null
+++ b/playbooks/adhoc/noc/roles
@@ -0,0 +1 @@
+../../../roles \ No newline at end of file
diff --git a/library/zbxapi.py b/roles/os_zabbix/library/zbxapi.py
index f4f52909b..f4f52909b 100755
--- a/library/zbxapi.py
+++ b/roles/os_zabbix/library/zbxapi.py