openstack/puppet-neutron
Code Issues Proposed changes

Fix neutron_agent_linuxbridge file path

Browse Source 
Like the ML2 OpenVSwitch agent, the ML2 LinuxBridge agent defines its
config in ml2_conf.ini on Ubuntu. This patch updates the
neutron_agent_linuxbridge provider to behave the same as the
neutron_agent_ovs provider.

Closes-Bug: #1480277

Change-Id: I24462f9d04a07926c05790b80ed5f0064fcef97d
(cherry picked from commit d465022f426cfabb97a499e124c4e6ea288afc84)
This commit is contained in:
Colleen Murphy 2015-08-24 21:35:12 -07:00
parent c683ca5fc3
commit ae7ebe59ef
1 changed files with 5 additions and 1 deletions

6
lib/puppet/provider/neutron_agent_linuxbridge/ini_setting.rb

@ -16,7 +16,11 @@ Puppet::Type.type(:neutron_agent_linuxbridge).provide(
end
def file_path
'/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini'
if Facter['operatingsystem'].value == 'Ubuntu'
'/etc/neutron/plugins/ml2/ml2_conf.ini'
else
'/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini'
end
end
end