Browse Source

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
Edgar Magana 2 years ago
parent
commit
6c83f0574c
1 changed files with 4 additions and 12 deletions
  1. 4
    12
      recipes/ml2_openvswitch.rb

+ 4
- 12
recipes/ml2_openvswitch.rb View File

@@ -30,17 +30,9 @@ include_recipe 'openstack-network::ml2_core_plugin'
30 30
 node.default['openstack']['network']['plugins']['ml2']['conf']['ml2']['mechanism_drivers'] = 'openvswitch'
31 31
 
32 32
 node.default['openstack']['network']['plugins']['openvswitch'].tap do |ovs|
33
-  case node['platform_family']
34
-  when 'fedora', 'rhel'
35
-    ovs['path'] =
36
-      '/etc/neutron/plugins/openvswitch'
37
-    ovs['filename'] =
38
-      'ovs_neutron_plugin.ini'
39
-  when 'debian'
40
-    ovs['path'] =
41
-      '/etc/neutron/plugins/ml2'
42
-    ovs['filename'] =
43
-      'openvswitch_agent.ini'
44
-  end
33
+  ovs['path'] =
34
+    '/etc/neutron/plugins/ml2'
35
+  ovs['filename'] =
36
+    'openvswitch_agent.ini'
45 37
   ovs['conf']['DEFAULT']['integration_bridge'] = 'br-int'
46 38
 end

Loading…
Cancel
Save