From 0581d676131027dde7dc73a647760b0f3a8ced65 Mon Sep 17 00:00:00 2001
From: Aaron Smith <aasmith@redhat.com>
Date: Wed, 28 Feb 2018 14:24:35 +0000
Subject: Revert "Merge conflict"

This reverts commit 7f4ef61d68c3ed96759f3553b2793e0ce6a7e4a5.

Change-Id: I0ac115a5e6dfbc53051ed7ee6ae0ceb72a8128af
Signed-off-by: TsaLaGi <aasmith@redhat.com>
---
 .../ansible/roles/config_files/tasks/vswitch.yml   | 49 ++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 docker/ansible/roles/config_files/tasks/vswitch.yml

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

diff --git a/docker/ansible/roles/config_files/tasks/vswitch.yml b/docker/ansible/roles/config_files/tasks/vswitch.yml
new file mode 100644
index 00000000..baffc4bd
--- /dev/null
+++ b/docker/ansible/roles/config_files/tasks/vswitch.yml
@@ -0,0 +1,49 @@
+#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
+
+
-- 
cgit 1.2.3-korg