summaryrefslogtreecommitdiffstats
path: root/roles/fluentd_node/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'roles/fluentd_node/tasks')
-rw-r--r--roles/fluentd_node/tasks/main.yml17
1 files changed, 6 insertions, 11 deletions
diff --git a/roles/fluentd_node/tasks/main.yml b/roles/fluentd_node/tasks/main.yml
index 827a1c075..9fd908687 100644
--- a/roles/fluentd_node/tasks/main.yml
+++ b/roles/fluentd_node/tasks/main.yml
@@ -1,16 +1,12 @@
---
-# TODO: Update fluentd install and configuration when packaging is complete
-- name: download and install td-agent
- yum:
- name: 'http://packages.treasuredata.com/2/redhat/7/x86_64/td-agent-2.2.0-0.x86_64.rpm'
- state: present
- when: ansible_pkg_mgr == "yum"
+- fail:
+ msg: "fluentd node is not yet supported on atomic hosts"
+ when: openshift.common.is_atomic | bool
+# TODO: Update fluentd install and configuration when packaging is complete
- name: download and install td-agent
- dnf:
- name: 'http://packages.treasuredata.com/2/redhat/7/x86_64/td-agent-2.2.0-0.x86_64.rpm'
- state: present
- when: ansible_pkg_mgr == "dnf"
+ action: "{{ ansible_pkg_mgr }} name='http://packages.treasuredata.com/2/redhat/7/x86_64/td-agent-2.2.0-0.x86_64.rpm' state=present"
+ when: not openshift.common.is_atomic | bool
- name: Verify fluentd plugin installed
command: '/opt/td-agent/embedded/bin/gem query -i fluent-plugin-kubernetes'
@@ -59,4 +55,3 @@
name: 'td-agent'
state: started
enabled: yes
-