Skip to content

Commit 1e5e1b9

Browse files
committed
OVS Agent with ML2: fix symlink on RH plateforms
Change the symlink to ensure /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini points to /etc/neutron/plugins/ml2/ml2_conf.ini . /etc/neutron/plugin.ini is not managed by the RH package (OVS neutron plugin by default) so the OVS agent won't load it. Source: https://bugzilla.redhat.com/show_bug.cgi?id=1087647 Change-Id: I89364a215eff28652ab424b30911f6bd348f1d47 Closes-bug: #1425213 (cherry picked from commit 163e631895bb0c9f98f11f3f2ff3d99b1f449b49)
1 parent ba6a57a commit 1e5e1b9

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

manifests/agents/ml2/ovs.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
# instead of the ml2 config file.
222222
file { '/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini':
223223
ensure => link,
224-
target => '/etc/neutron/plugin.ini'
224+
target => '/etc/neutron/plugins/ml2/ml2_conf.ini'
225225
} ~> Service<| title == 'neutron-ovs-agent-service' |>
226226
}
227227
}

spec/classes/neutron_agents_ml2_ovs_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
it 'links from ovs config to plugin config' do
215215
should contain_file('/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini').with(
216216
:ensure => 'link',
217-
:target => '/etc/neutron/plugin.ini'
217+
:target => '/etc/neutron/plugins/ml2/ml2_conf.ini'
218218
)
219219
end
220220
end

0 commit comments

Comments
 (0)