openstack
/
fuel-library
Code Issues Proposed changes

Do not append a config file to OVS agent commandline 

The original issue when OVS agent missed required configuration file has been
fixed in packages, so there's no more need to add this configuration file
explicitly

Change-Id: If1361b2d4cfc8561d01bf2d166e8dce7b3905c21
Related-bug: #1549934
(cherry picked from commit eb096c9aad)
This commit is contained in:
Sergey Kolekonov 2016-04-05 13:38:57 +03:00
parent 9ed997b797
commit 9d6840ed08
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment/puppet/openstack_tasks/manifests/openstack_network/plugins/ml2.pp
View File

@ -95,16 +95,6 @@ class openstack_tasks::openstack_network::plugins::ml2 {
$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 \'"$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']
}
if $enable_dpdk and $compute {
neutron_agent_ovs {
'securitygroup/enable_security_group': value => false;