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>

17 files changed, 0 insertions, 646 deletions

diff --git a/docker/ansible/roles/config_files/tasks/csv.yml b/docker/ansible/roles/config_files/tasks/csv.yml
deleted file mode 100644
index 0be4ec8f..00000000
--- a/docker/ansible/roles/config_files/tasks/csv.yml
+++ /dev/null
@@ -1,22 +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: enable csv plugin
-  template:
-    src: csv.conf.j2
-    dest: "{{ config_file_dir }}/csv.conf"
-  tags:
-    - csv
-
diff --git a/docker/ansible/roles/config_files/tasks/default_read_import.yml b/docker/ansible/roles/config_files/tasks/default_read_import.yml
deleted file mode 100644
index f11b8b80..00000000
--- a/docker/ansible/roles/config_files/tasks/default_read_import.yml
+++ /dev/null
@@ -1,143 +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: enable cpu plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin cpu(\s+.*)?$'
-      replace: '\1LoadPlugin cpu\2'
-  tags:
-    - cpu
-
-- name: enable cpufreq plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin cpufreq(\s+.*)?$'
-      replace: '\1LoadPlugin cpufreq\2'
-  tags:
-    - cpufreq
-
-- name: enable disk plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin disk(\s+.*)?$'
-      replace: '\1LoadPlugin disk\2'
-  tags:
-    - disk
-
-- name: enable load plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin load(\s+.*)?$'
-      replace: '\1LoadPlugin load\2'
-  tags:
-    - load
-
-- name: enable memory plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin memory(\s+.*)?$'
-      replace: '\1LoadPlugin memory\2'
-  tags:
-    - memory
-
-- name: enable numa plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin numa(\s+.*)?$'
-      replace: '\1LoadPlugin numa\2'
-  tags:
-    - numa
-
-- name: enable processes plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin processes(\s+.*)?$'
-      replace: '\1LoadPlugin processes\2'
-  tags:
-    - processes
-
-- name: enable irq plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin irq(\s+.*)?$'
-      replace: '\1LoadPlugin irq\2'
-  tags:
-    - irq
-
-- name: enable swap plugin
-  replace:
-      path: "{{ config_file_dir }}/default_plugins.conf"
-      regexp: '(\s+)#LoadPlugin swap(\s+.*)?$'
-      replace: '\1LoadPlugin swap\2'
-  tags:
-    - swap
-
-- name: enable ethstat plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin ethstat(\s+.*)?$'
-      replace: '\1LoadPlugin ethstat\2'
-  tags:
-    - ethstat
-
-- name: enable ipc plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin ipc(\s+.*)?$'
-      replace: '\1LoadPlugin ipc\2'
-  tags:
-    - ipc
-
-- name: enable ipmi plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin ipmi(\s+.*)?$'
-      replace: '\1LoadPlugin ipmi\2'
-  tags:
-    - ipmi
-
-- name: enable df plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin df(\s+.*)?$'
-      replace: '\1LoadPlugin df\2'
-  tags:
-    - df
-
-- name: enable turbostat plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin turbostat(\s+.*)?$'
-      replace: '\1LoadPlugin turbostat\2'
-  tags:
-    - turbostat
-
-- name: enable uptime plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin uptime(\s+.*)?$'
-      replace: '\1LoadPlugin uptime\2'
-  tags:
-    - uptime
-
-- name: enable contextswitch  plugin
-  replace:
-      path: "{{ config_file_dir }}/default_read_plugins.conf"
-      regexp: '(\s+)#LoadPlugin contextswitch(\s+.*)?$'
-      replace: '\1LoadPlugin contextswitch\2'
-  tags:
-    - contextswitch
-
diff --git a/docker/ansible/roles/config_files/tasks/default_read_plugins.yml b/docker/ansible/roles/config_files/tasks/default_read_plugins.yml
deleted file mode 100644
index 95b942c2..00000000
--- a/docker/ansible/roles/config_files/tasks/default_read_plugins.yml
+++ /dev/null
@@ -1,34 +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: copy default template to system
-  template:
-    src: default_read_plugins.conf.j2
-    dest: "{{ config_file_dir }}/default_read_plugins.conf"
-  tags:
-   - always
-
-- name: enable all default plugins
-  replace:
-    path: "{{ config_file_dir }}/default_read_plugins.conf"
-    regexp: '(\s+)#LoadPlugin(\s+.*)?$'
-    replace: '\1LoadPlugin\2'
-  register: en_default_all
-  tags:
-    - en_default_all
-
-- name: include per default plugin tasks
-  include: default_read_import.yml
-  when: en_default_all is not defined
\ No newline at end of file
diff --git a/docker/ansible/roles/config_files/tasks/exec.yml b/docker/ansible/roles/config_files/tasks/exec.yml
deleted file mode 100644
index b7389703..00000000
--- a/docker/ansible/roles/config_files/tasks/exec.yml
+++ /dev/null
@@ -1,21 +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: enable exec plugin
-  template:
-    src: exec.conf.j2
-    dest: "{{ config_file_dir }}/exec.conf"
-  tags:
-    - exec
diff --git a/docker/ansible/roles/config_files/tasks/hugepages.yml b/docker/ansible/roles/config_files/tasks/hugepages.yml
deleted file mode 100644
index bf49035c..00000000
--- a/docker/ansible/roles/config_files/tasks/hugepages.yml
+++ /dev/null
@@ -1,33 +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: check if hugepages folders exist on host
-  stat:
-    path: "{{ item }}"
-  register: hugepages_result
-  ignore_errors: "true"
-  with_items:
-    /sys/devices/system/node
-    /sys/kernel/mm/hugepages
-  tags:
-    - hugepages
-
-- name: enable hugepages plugin
-  template:
-    src: hugepages.conf.j2
-    dest: "{{ config_file_dir }}//hugepages.conf"
-  when: hugepages_result|succeeded
-  tags:
-    - hugepages
diff --git a/docker/ansible/roles/config_files/tasks/kafka.yml b/docker/ansible/roles/config_files/tasks/kafka.yml
deleted file mode 100644
index d7639cbf..00000000
--- a/docker/ansible/roles/config_files/tasks/kafka.yml
+++ /dev/null
@@ -1,21 +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: enable kafka plugin
-  template:
-    src: kafka.conf.j2
-    dest: "{{ config_file_dir }}/kafka.conf"
-  tags:
-    - kafka
diff --git a/docker/ansible/roles/config_files/tasks/logfile.yml b/docker/ansible/roles/config_files/tasks/logfile.yml
deleted file mode 100644
index b2700594..00000000
--- a/docker/ansible/roles/config_files/tasks/logfile.yml
+++ /dev/null
@@ -1,25 +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: enable logfile plugin
-  template:
-    src: logfile.conf.j2
-    dest: "{{ config_file_dir }}/logfile.conf"
-  tags:
-    - logfile
-
-
-
-
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
diff --git a/docker/ansible/roles/config_files/tasks/mcelog.yml b/docker/ansible/roles/config_files/tasks/mcelog.yml
deleted file mode 100644
index 9c935e3e..00000000
--- a/docker/ansible/roles/config_files/tasks/mcelog.yml
+++ /dev/null
@@ -1,44 +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: check if mcelog running on host
-  shell: ps -ef | grep mcelog | grep -v grep > /dev/null
-  register: mcelog_running
-  ignore_errors: "true"
-  tags:
-    - mcelogs
-
-- name: check if mcelog exists
-  shell: which mcelog > /dev/null
-  register: mcelog_exists
-  ignore_errors: "true"
-  tags:
-    - mcelogs
-
-- name: check if mcelog-client exists
-  stat:
-    path: /var/run/mcelog-client
-  register: mcelog_client_exists
-  ignore_errors: "true"
-  tags:
-   - mcelogs
-
-- name: enable mcelog plugin
-  template:
-    src: mcelog.conf.j2
-    dest: "{{ config_file_dir }}/mcelog.conf"
-  when: mcelog_running|succeeded and mcelog_exists|succeeded and mcelog_client_exists|succeeded
-  tags:
-    - mcelogs
diff --git a/docker/ansible/roles/config_files/tasks/network.yml b/docker/ansible/roles/config_files/tasks/network.yml
deleted file mode 100644
index dca0c235..00000000
--- a/docker/ansible/roles/config_files/tasks/network.yml
+++ /dev/null
@@ -1,21 +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: enable network plugin
-  template:
-    src: network.conf.j2
-    dest: "{{ config_file_dir }}/network.conf"
-  tags:
-     - network
diff --git a/docker/ansible/roles/config_files/tasks/pmu.yml b/docker/ansible/roles/config_files/tasks/pmu.yml
deleted file mode 100644
index 20e3034c..00000000
--- a/docker/ansible/roles/config_files/tasks/pmu.yml
+++ /dev/null
@@ -1,21 +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: enable intel_pmu plugin
-  template:
-    src: intel_pmu.conf.j2
-    dest: "{{ config_file_dir }}/intel_pmu.conf"
-  tags:
-    - pmu
diff --git a/docker/ansible/roles/config_files/tasks/rdt.yml b/docker/ansible/roles/config_files/tasks/rdt.yml
deleted file mode 100644
index cbfa7de5..00000000
--- a/docker/ansible/roles/config_files/tasks/rdt.yml
+++ /dev/null
@@ -1,39 +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: check if rdt on host
-  shell: |
-    grep -q cqm* "/proc/cpuinfo"
-  register: rdt_result
-  ignore_errors: "true"
-  tags:
-    - rdt
-
-- name: (rdt) check if virt is enabled
-  stat:
-      path: "{{ config_file_dir }}/virt.conf"
-  register: virt_file
-  tags:
-    - rdt
-
-- name: enable rdt plugin
-  template:
-    src: rdt.conf.j2
-    dest: "{{ config_file_dir }}/rdt.conf"
-  when: rdt_result|succeeded and virt_file.stat.exists == False
-  tags:
-    - rdt
-
-
diff --git a/docker/ansible/roles/config_files/tasks/rrdtool.yml b/docker/ansible/roles/config_files/tasks/rrdtool.yml
deleted file mode 100644
index 4c681dc6..00000000
--- a/docker/ansible/roles/config_files/tasks/rrdtool.yml
+++ /dev/null
@@ -1,22 +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: enable rrdtool plugin
-  template:
-    src: rrdtool.conf.j2
-    dest: "{{ config_file_dir }}/rrdtool.conf"
-  tags:
-    - rrdtool
-
diff --git a/docker/ansible/roles/config_files/tasks/snmp_agent.yml b/docker/ansible/roles/config_files/tasks/snmp_agent.yml
deleted file mode 100644
index 603dc122..00000000
--- a/docker/ansible/roles/config_files/tasks/snmp_agent.yml
+++ /dev/null
@@ -1,21 +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: enable snmp agent
-  template:
-    src: snmp_agent.conf.j2
-    dest: "{{ config_file_dir }}/snmp_agent.conf"
-  tags:
-    - snmp
diff --git a/docker/ansible/roles/config_files/tasks/syslog.yml b/docker/ansible/roles/config_files/tasks/syslog.yml
deleted file mode 100644
index 97864a5d..00000000
--- a/docker/ansible/roles/config_files/tasks/syslog.yml
+++ /dev/null
@@ -1,22 +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: enable syslog plugin
-  template:
-    src: syslog.conf.j2
-    dest: "{{ config_file_dir }}/syslog.conf"
-  tags:
-    - syslog
-
diff --git a/docker/ansible/roles/config_files/tasks/virt.yml b/docker/ansible/roles/config_files/tasks/virt.yml
deleted file mode 100644
index 9db10e8c..00000000
--- a/docker/ansible/roles/config_files/tasks/virt.yml
+++ /dev/null
@@ -1,36 +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: check if libvirtd on host
-  shell: ps -ef | grep libvirtd | grep -v grep > /dev/null
-  register: libvirt_result
-  ignore_errors: "true"
-  tags:
-   - virt
-
-- name: (virt) check if rdt  is enabled
-  stat:
-      path: "{{ config_file_dir }}/rdt.conf"
-  register: rdt_file
-  tags:
-    - virt
-
-- name: enable virt plugin
-  template:
-    src: virt.conf.j2
-    dest: "{{ config_file_dir }}/virt.conf"
-  when: libvirt_result|succeeded and rdt_file.stat.exists == False
-  tags:
-   - virt
diff --git a/docker/ansible/roles/config_files/tasks/vswitch.yml b/docker/ansible/roles/config_files/tasks/vswitch.yml
deleted file mode 100644
index baffc4bd..00000000
--- a/docker/ansible/roles/config_files/tasks/vswitch.yml
+++ /dev/null
@@ -1,49 +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: Check if vswitchd is running
-  shell: ps -ef | grep vswitchd | grep -v grep > /dev/null
-  register: vswitchd_running
-  ignore_errors: True
-  tags:
-     - ovs_stats
-     - ovs_events
-
-- name: Check if db.sock exists
-  stat:
-    path: /var/run/openvswitch/db.sock
-  register: dbsock_exists
-  ignore_errors: True
-  tags:
-     - ovs_stats
-     - ovs_events
-
-- name: enable ovs_stats plugin
-  template:
-    src: "ovs_stats.conf.j2"
-    dest: "{{ config_file_dir }}/ovs_stats.conf"
-  when: vswitchd_running|succeeded and dbsock_exists|succeeded
-  tags:
-   - ovs_stats
-
-- name: enable ovs_events plugin
-  template:
-    src: "ovs_events.conf.j2"
-    dest: "{{ config_file_dir }}/ovs_events.conf"
-  when: vswitchd_running|succeeded and dbsock_exists|succeeded
-  tags:
-    - ovs_events
-
-