openstack
/
cookbook-openstack-network
Code Issues Proposed changes

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
This commit is contained in:
Edgar Magana 2016-09-06 15:28:42 -07:00
parent 0141794350
commit 6c83f0574c
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
recipes/ml2_openvswitch.rb
View File

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