openstack
/
fuel-library
Code Issues Proposed changes

Explicitly add openvswitch_agent.ini to OVS agent commandline 

Commit Ic170d932df53bb1d7bd3b0eda116ad36d0b929c6 moved some required options
for OVS agent to /etc/neutron/plugins/ml2/openvswitch_agent.ini which is not
loaded by MOS packages. Explicitly add to OVS agent commandline until MOS
packages will be updated

Change-Id: I901c7209f9d2c9e68698683c51bce4764db79031
Closes-bug: #1549934
This commit is contained in:
Sergey Kolekonov 2016-02-25 22:05:53 +03:00
parent 9485cc75ac
commit 0ae7bf1283
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/cluster/manifests/neutron/ovs.pp
View File

@ -2,7 +2,7 @@
class cluster::neutron::ovs (
$primary = false,
$plugin_config = '/etc/neutron/plugin.ini',
$plugin_config = '/etc/neutron/plugins/ml2/openvswitch_agent.ini',
) {
require cluster::neutron

10
deployment/puppet/osnailyfacter/modular/openstack-network/plugins/ml2.pp
View File

@ -84,6 +84,16 @@ if $use_neutron {
$enable_tunneling = true
}
# TODO(skolekonov) Remove this once Neutron packages are updated
if $compute and $::os_package_type == 'debian' {
augeas { '/etc/default/neutron-openvswitch-agent:ovs_config':
context => '/files/etc/default/neutron-openvswitch-agent',
changes => 'set DAEMON_ARGS \'"--config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini"\'',
notify => Service['neutron-ovs-agent-service'],
}
Package['neutron-ovs-agent'] -> Augeas['/etc/default/neutron-openvswitch-agent:ovs_config']
}
class { 'neutron::agents::ml2::ovs':
bridge_mappings => $bridge_mappings,
enable_tunneling => $enable_tunneling,