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>

1 files changed, 0 insertions, 49 deletions

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
-
-