summaryrefslogtreecommitdiffstats
path: root/roles/fluentd_master
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2015-12-09 15:06:48 -0500
committerScott Dodson <sdodson@redhat.com>2015-12-09 16:43:27 -0500
commitb1d30491f1581503003646684137bf2c218660ba (patch)
treecba54e9138630742d0788a5cff9f70ec75b93032 /roles/fluentd_master
parentecae1fcaaf6d83f2fb6dce0624990b2d13c25db9 (diff)
downloadopenshift-b1d30491f1581503003646684137bf2c218660ba.tar.gz
openshift-b1d30491f1581503003646684137bf2c218660ba.tar.bz2
openshift-b1d30491f1581503003646684137bf2c218660ba.tar.xz
openshift-b1d30491f1581503003646684137bf2c218660ba.zip
Remove yum / dnf duplication
Diffstat (limited to 'roles/fluentd_master')
-rw-r--r--roles/fluentd_master/tasks/main.yml11
1 files changed, 1 insertions, 10 deletions
diff --git a/roles/fluentd_master/tasks/main.yml b/roles/fluentd_master/tasks/main.yml
index 43c499b4d..65c67fe8d 100644
--- a/roles/fluentd_master/tasks/main.yml
+++ b/roles/fluentd_master/tasks/main.yml
@@ -1,16 +1,7 @@
---
# 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"
-
-- 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"
- name: Verify fluentd plugin installed
command: '/opt/td-agent/embedded/bin/gem query -i fluent-plugin-kubernetes'