2 files changed, 0 insertions, 66 deletions
diff --git a/roles/fluentd_master/tasks/main.yml b/roles/fluentd_master/tasks/main.yml
deleted file mode 100644
index 32f972f0a..000000000
--- a/roles/fluentd_master/tasks/main.yml
+++ /dev/null
@@ -1,57 +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: 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'
-    state: started
-    enabled: yes
diff --git a/roles/fluentd_master/templates/kubernetes.conf.j2 b/roles/fluentd_master/templates/kubernetes.conf.j2
deleted file mode 100644
index 7b5c86062..000000000
--- a/roles/fluentd_master/templates/kubernetes.conf.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-<match kubernetes.**>
-    type file
-    path /var/log/td-agent/containers.log
-    time_slice_format %Y%m%d
-    time_slice_wait 10m
-    time_format %Y%m%dT%H%M%S%z
-    compress gzip
-    utc
-</match>