From 6c83f0574c582a9d7d88d1ffbbfead6de0f1cf36 Mon Sep 17 00:00:00 2001
From: Edgar Magana <emagana@gmail.com>
Date: Tue, 6 Sep 2016 15:28:42 -0700
Subject: [PATCH] Use the right path and file name for rhel and fedora OVS conf
 files

Fix bug 1620842 - Using the right conf file for OVS
Removes a condition that is no longer needed

Closes-Bug: #1620842

Change-Id: Ideed42ca554d814d261e4aa448b21f011b442c78
---
 recipes/ml2_openvswitch.rb | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/recipes/ml2_openvswitch.rb b/recipes/ml2_openvswitch.rb
index 592ea6d1..0201aa8e 100644
--- a/recipes/ml2_openvswitch.rb
+++ b/recipes/ml2_openvswitch.rb
@@ -30,17 +30,9 @@ include_recipe 'openstack-network::ml2_core_plugin'
 node.default['openstack']['network']['plugins']['ml2']['conf']['ml2']['mechanism_drivers'] = 'openvswitch'
 
 node.default['openstack']['network']['plugins']['openvswitch'].tap do |ovs|
-  case node['platform_family']
-  when 'fedora', 'rhel'
-    ovs['path'] =
-      '/etc/neutron/plugins/openvswitch'
-    ovs['filename'] =
-      'ovs_neutron_plugin.ini'
-  when 'debian'
-    ovs['path'] =
-      '/etc/neutron/plugins/ml2'
-    ovs['filename'] =
-      'openvswitch_agent.ini'
-  end
+  ovs['path'] =
+    '/etc/neutron/plugins/ml2'
+  ovs['filename'] =
+    'openvswitch_agent.ini'
   ovs['conf']['DEFAULT']['integration_bridge'] = 'br-int'
 end