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
(cherry picked from commit 6c83f0574c
)
This commit is contained in:
parent
180868eeaa
commit
a1a27d1c9f
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue