Fix LinuxBridge Agent configuration file name

File name should be inuxbridge_agent.ini on both UCA & RDO platforms.

Closes-Bug: #1560716
Change-Id: Ibc2523013256a9b3ccf0d511e7a08f7dea68d122
This commit is contained in:
Emilien Macchi 2016-03-22 21:04:30 -04:00
parent 7baa3858af
commit 5686e0e05b
3 changed files with 8 additions and 3 deletions

View File

@ -4,7 +4,7 @@ Puppet::Type.type(:neutron_agent_linuxbridge).provide(
) do
def file_path
'/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini'
'/etc/neutron/plugins/ml2/linuxbridge_agent.ini'
end
end

View File

@ -0,0 +1,5 @@
---
fixes:
- Fixes `bug 1560716
<https://bugs.launchpad.net/puppet-neutron/+bug/1560716>`__ so
LinuxBridge configuration file path is the correct one for RDO & UCA packaging.

View File

@ -37,7 +37,7 @@ describe provider_class do
provider = provider_class.new(resource)
expect(provider.section).to eq('DEFAULT')
expect(provider.setting).to eq('foo')
expect(provider.file_path).to eq('/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini')
expect(provider.file_path).to eq('/etc/neutron/plugins/ml2/linuxbridge_agent.ini')
end
it 'should allow setting to be set explicitly' do
@ -50,7 +50,7 @@ describe provider_class do
provider = provider_class.new(resource)
expect(provider.section).to eq('dude')
expect(provider.setting).to eq('foo')
expect(provider.file_path).to eq('/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini')
expect(provider.file_path).to eq('/etc/neutron/plugins/ml2/linuxbridge_agent.ini')
end
it 'should ensure absent when <SERVICE DEFAULT> is specified as a value' do