diff --git a/lib/puppet/provider/neutron_agent_linuxbridge/ini_setting.rb b/lib/puppet/provider/neutron_agent_linuxbridge/ini_setting.rb index ca0694fbe..9db037784 100644 --- a/lib/puppet/provider/neutron_agent_linuxbridge/ini_setting.rb +++ b/lib/puppet/provider/neutron_agent_linuxbridge/ini_setting.rb @@ -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 diff --git a/releasenotes/notes/fix_lb_driver-d429a30889ef8f22.yaml b/releasenotes/notes/fix_lb_driver-d429a30889ef8f22.yaml new file mode 100644 index 000000000..98f3a0204 --- /dev/null +++ b/releasenotes/notes/fix_lb_driver-d429a30889ef8f22.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - Fixes `bug 1560716 + `__ so + LinuxBridge configuration file path is the correct one for RDO & UCA packaging. diff --git a/spec/unit/provider/neutron_agent_linuxbridge/ini_setting_spec.rb b/spec/unit/provider/neutron_agent_linuxbridge/ini_setting_spec.rb index 1f915e706..6cc0522b8 100644 --- a/spec/unit/provider/neutron_agent_linuxbridge/ini_setting_spec.rb +++ b/spec/unit/provider/neutron_agent_linuxbridge/ini_setting_spec.rb @@ -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 is specified as a value' do