From 7f4ef61d68c3ed96759f3553b2793e0ce6a7e4a5 Mon Sep 17 00:00:00 2001
From: TsaLaGi <aasmith@redhat.com>
Date: Tue, 27 Feb 2018 09:17:38 -0500
Subject: Merge conflict

Revert "Merge "ansible: add ansible scripts to configure .conf file on collectd nodes""

This reverts commit 7effd9e1e84dd7fa2a189a0815b5be1c0fcb165a, reversing
changes made to b26034d05aa81f624e9bcee2c8e82a1cacfe44c4.

Change-Id: I6f77b4432bbe0de29db3e099263e461e3043b22e
Signed-off-by: TsaLaGi <aasmith@redhat.com>
---
 docker/ansible/roles/config_files/tasks/main.yml | 72 ------------------------
 1 file changed, 72 deletions(-)
 delete mode 100644 docker/ansible/roles/config_files/tasks/main.yml

(limited to 'docker/ansible/roles/config_files/tasks/main.yml')

diff --git a/docker/ansible/roles/config_files/tasks/main.yml b/docker/ansible/roles/config_files/tasks/main.yml
deleted file mode 100644
index 2f0938c0..00000000
--- a/docker/ansible/roles/config_files/tasks/main.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-#Copyright 2018 OPNFV and Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
----
-
-- name: Clean collectd config dir path
-  file:
-    state: absent
-    path: "{{ config_file_dir }}"
-  tags:
-   - rm_config_dir
-   - always
-
-- name: Create collectd.d folder on remote host
-  file:
-    path: "{{ config_file_dir }}"
-    force: yes
-    state: directory
-  tags:
-    - always
-
-- name: enable csv plugin
-  import_tasks: csv.yml
-
-- name: enable default plugins
-  import_tasks: default_read_plugins.yml
-
-- name: enable exec plugin
-  import_tasks: exec.yml
-
-- name: enable hugepages plugin
-  import_tasks: hugepages.yml
-
-- name: enable kafka plugin
-  import_tasks: kafka.yml
-
-- name: enable logfile plugin
-  import_tasks: logfile.yml
-
-- name: enable mcelog plugin
-  import_tasks: mcelog.yml
-
-- name: enable network plugin
-  import_tasks: network.yml
-
-- name: enable pmu plugin
-  import_tasks: pmu.yml
-
-- name: enable rdt plugin
-  import_tasks: rdt.yml
-
-- name: enable rddtool plugin
-  import_tasks: rrdtool.yml
-
-- name: enable snmp_agent plugin
-  import_tasks: snmp_agent.yml
-
-- name: enable syslog plugin
-  import_tasks: syslog.yml
-
-- name: enable virt plugin
-  import_tasks: virt.yml
-- 
cgit 1.2.3-korg