summaryrefslogtreecommitdiffstats
path: root/roles/os_zabbix/tasks
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-12-14 12:47:51 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-12-14 12:47:51 -0500
commit4dfe16e0e567a633cedd8ee56ffaed5110ca1629 (patch)
treeaa67c9a14ae30cf02177e53ae3e8d1e9c878f1c8 /roles/os_zabbix/tasks
parenteeb164fae0e6721100c4fcc1717d92bb85b9652c (diff)
parent4322b19c0503a4f149ac5bca251beba14178948d (diff)
downloadopenshift-4dfe16e0e567a633cedd8ee56ffaed5110ca1629.tar.gz
openshift-4dfe16e0e567a633cedd8ee56ffaed5110ca1629.tar.bz2
openshift-4dfe16e0e567a633cedd8ee56ffaed5110ca1629.tar.xz
openshift-4dfe16e0e567a633cedd8ee56ffaed5110ca1629.zip
Merge pull request #1059 from twiest/master
sync master -> prod branch
Diffstat (limited to 'roles/os_zabbix/tasks')
-rw-r--r--roles/os_zabbix/tasks/main.yml13
1 files changed, 13 insertions, 0 deletions
diff --git a/roles/os_zabbix/tasks/main.yml b/roles/os_zabbix/tasks/main.yml
index d0b307a3d..7552086d4 100644
--- a/roles/os_zabbix/tasks/main.yml
+++ b/roles/os_zabbix/tasks/main.yml
@@ -37,6 +37,9 @@
- include_vars: template_aws.yml
tags:
- aws
+- include_vars: template_zagg_server.yml
+ tags:
+ - zagg_server
- name: Include Template Heartbeat
include: ../../lib_zabbix/tasks/create_template.yml
@@ -137,3 +140,13 @@
password: "{{ ozb_password }}"
tags:
- aws
+
+- name: Include Template Zagg Server
+ include: ../../lib_zabbix/tasks/create_template.yml
+ vars:
+ template: "{{ g_template_zagg_server }}"
+ server: "{{ ozb_server }}"
+ user: "{{ ozb_user }}"
+ password: "{{ ozb_password }}"
+ tags:
+ - zagg_server