From 4854cd42c4705e594c8c5fd8334c702a756c71af Mon Sep 17 00:00:00 2001
From: Andrew Butcher <abutcher@redhat.com>
Date: Thu, 4 Feb 2016 10:58:50 -0500
Subject: Remove etcd up checks from fluentd_master.

---
 roles/fluentd_master/tasks/main.yml | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'roles/fluentd_master/tasks/main.yml')

diff --git a/roles/fluentd_master/tasks/main.yml b/roles/fluentd_master/tasks/main.yml
index 32f972f0a..8f8a4302d 100644
--- a/roles/fluentd_master/tasks/main.yml
+++ b/roles/fluentd_master/tasks/main.yml
@@ -42,14 +42,6 @@
     owner: 'td-agent'
     mode: 0444
 
-- name: wait for etcd to start up
-  wait_for: port=4001 delay=10
-  when: embedded_etcd | bool
-
-- name: wait for etcd peer to start up
-  wait_for: port=7001 delay=10
-  when: embedded_etcd | bool
-
 - name: ensure td-agent is running
   service:
     name: 'td-agent'
-- 
cgit v1.2.3


From 2b3af4a3d009e6eac172db437b1e701ec5004dc9 Mon Sep 17 00:00:00 2001
From: Andrew Butcher <abutcher@redhat.com>
Date: Mon, 8 Feb 2016 16:59:08 -0500
Subject: Remove fluentd_master and fluentd_node roles.

---
 roles/fluentd_master/tasks/main.yml | 49 -------------------------------------
 1 file changed, 49 deletions(-)
 delete mode 100644 roles/fluentd_master/tasks/main.yml

(limited to 'roles/fluentd_master/tasks/main.yml')

diff --git a/roles/fluentd_master/tasks/main.yml b/roles/fluentd_master/tasks/main.yml
deleted file mode 100644
index 8f8a4302d..000000000
--- a/roles/fluentd_master/tasks/main.yml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- fail:
-    msg: "fluentd master 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
-  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'
-  register: _fluent_plugin_check
-  failed_when: false
-  changed_when: false
-
-- name: install Kubernetes fluentd plugin
-  command: '/opt/td-agent/embedded/bin/gem install fluent-plugin-kubernetes'
-  when: _fluent_plugin_check.rc == 1
-
-- name: Creates directories
-  file:
-    path: "{{ item }}"
-    state: directory
-    group: 'td-agent'
-    owner: 'td-agent'
-    mode: 0755
-  with_items: ['/etc/td-agent/config.d']
-
-- name: Add include to td-agent configuration
-  lineinfile:
-    dest: '/etc/td-agent/td-agent.conf'
-    regexp: '^@include config.d'
-    line: '@include config.d/*.conf'
-    state: present
-
-- name: install Kubernetes fluentd configuration file
-  template:
-    src: kubernetes.conf.j2
-    dest: /etc/td-agent/config.d/kubernetes.conf
-    group: 'td-agent'
-    owner: 'td-agent'
-    mode: 0444
-
-- name: ensure td-agent is running
-  service:
-    name: 'td-agent'
-    state: started
-    enabled: yes
-- 
cgit v1.2.3