From a0b6fc7db1be2cf6190d982f90e96f4c39a4c699 Mon Sep 17 00:00:00 2001
From: Tobias Florek <tob@butter.sh>
Date: Wed, 23 Sep 2015 13:51:41 +0200
Subject: Initial containerization work from @ibotty
copied from https://github.com/eparis/kubernetes-ansible/blob/17f98edd7ff53e649b43e26822b8fbc0be42b233/roles/common/tasks/main.yml
---
roles/os_zabbix/tasks/main.yml | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'roles/os_zabbix')
diff --git a/roles/os_zabbix/tasks/main.yml b/roles/os_zabbix/tasks/main.yml
index 7552086d4..bd879c25f 100644
--- a/roles/os_zabbix/tasks/main.yml
+++ b/roles/os_zabbix/tasks/main.yml
@@ -1,4 +1,8 @@
---
+- fail:
+ msg: "Zabbix config is not yet supported on atomic hosts"
+ when: is_atomic
+
- name: Main List all templates
zbx_template:
zbx_server: "{{ ozb_server }}"
--
cgit v1.2.3
From 8e7c5c970b8adc83fd6d5cad115f4edb06b36d98 Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Mon, 5 Oct 2015 12:53:10 -0400
Subject: Containerization work by @sdodson
---
roles/os_zabbix/tasks/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'roles/os_zabbix')
diff --git a/roles/os_zabbix/tasks/main.yml b/roles/os_zabbix/tasks/main.yml
index bd879c25f..a8b65dd56 100644
--- a/roles/os_zabbix/tasks/main.yml
+++ b/roles/os_zabbix/tasks/main.yml
@@ -1,7 +1,7 @@
---
- fail:
msg: "Zabbix config is not yet supported on atomic hosts"
- when: is_atomic
+ when: openshift.common.is_containerized | bool
- name: Main List all templates
zbx_template:
--
cgit v1.2.3