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:
parent
7baa3858af
commit
5686e0e05b
@ -4,7 +4,7 @@ Puppet::Type.type(:neutron_agent_linuxbridge).provide(
|
|||||||
) do
|
) do
|
||||||
|
|
||||||
def file_path
|
def file_path
|
||||||
'/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini'
|
'/etc/neutron/plugins/ml2/linuxbridge_agent.ini'
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
5
releasenotes/notes/fix_lb_driver-d429a30889ef8f22.yaml
Normal file
5
releasenotes/notes/fix_lb_driver-d429a30889ef8f22.yaml
Normal 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.
|
@ -37,7 +37,7 @@ describe provider_class do
|
|||||||
provider = provider_class.new(resource)
|
provider = provider_class.new(resource)
|
||||||
expect(provider.section).to eq('DEFAULT')
|
expect(provider.section).to eq('DEFAULT')
|
||||||
expect(provider.setting).to eq('foo')
|
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
|
end
|
||||||
|
|
||||||
it 'should allow setting to be set explicitly' do
|
it 'should allow setting to be set explicitly' do
|
||||||
@ -50,7 +50,7 @@ describe provider_class do
|
|||||||
provider = provider_class.new(resource)
|
provider = provider_class.new(resource)
|
||||||
expect(provider.section).to eq('dude')
|
expect(provider.section).to eq('dude')
|
||||||
expect(provider.setting).to eq('foo')
|
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
|
end
|
||||||
|
|
||||||
it 'should ensure absent when <SERVICE DEFAULT> is specified as a value' do
|
it 'should ensure absent when <SERVICE DEFAULT> is specified as a value' do
|
||||||
|
Loading…
x
Reference in New Issue
Block a user