summaryrefslogtreecommitdiffstats
path: root/roles/os_zabbix/tasks
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-08-31 14:21:01 -0400
committerKenny Woodson <kwoodson@redhat.com>2015-08-31 14:21:01 -0400
commit2f9e5e2f6f76192a9ea0ccc687fcc7b8b16706a6 (patch)
tree724cceae135c9e966ad32cf5443dad16fca5a778 /roles/os_zabbix/tasks
parentbac81adf9d7036e02db457eb78d5d91c3d630cd9 (diff)
parent1f52ea8c4e2f8cfce51e98cb3614c61f0d78ec3e (diff)
downloadopenshift-2f9e5e2f6f76192a9ea0ccc687fcc7b8b16706a6.tar.gz
openshift-2f9e5e2f6f76192a9ea0ccc687fcc7b8b16706a6.tar.bz2
openshift-2f9e5e2f6f76192a9ea0ccc687fcc7b8b16706a6.tar.xz
openshift-2f9e5e2f6f76192a9ea0ccc687fcc7b8b16706a6.zip
Merge pull request #539 from twiest/pr
added docker zabbix template, removed unused / old templates so they don't confuse other people.
Diffstat (limited to 'roles/os_zabbix/tasks')
-rw-r--r--roles/os_zabbix/tasks/main.yml9
1 files changed, 9 insertions, 0 deletions
diff --git a/roles/os_zabbix/tasks/main.yml b/roles/os_zabbix/tasks/main.yml
index 7111c778b..5d6e67606 100644
--- a/roles/os_zabbix/tasks/main.yml
+++ b/roles/os_zabbix/tasks/main.yml
@@ -11,6 +11,7 @@
- include_vars: template_heartbeat.yml
- include_vars: template_os_linux.yml
+- include_vars: template_docker.yml
- name: Include Template Heartbeat
include: ../../lib_zabbix/tasks/create_template.yml
@@ -28,3 +29,11 @@
user: "{{ ozb_user }}"
password: "{{ ozb_password }}"
+- name: Include Template docker
+ include: ../../lib_zabbix/tasks/create_template.yml
+ vars:
+ template: "{{ g_template_docker }}"
+ server: "{{ ozb_server }}"
+ user: "{{ ozb_user }}"
+ password: "{{ ozb_password }}"
+