openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Remove clean up of [DEFAULT] ovs_integration_bridge"

This commit is contained in:
Zuul 2022-05-11 12:40:49 +00:00 committed by Gerrit Code Review
parent 1db4b1b9b6 612d367242
commit 74c6761965
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/agents/dhcp.pp
View File

@ -197,12 +197,6 @@ class neutron::agents::dhcp (
'DEFAULT/rpc_response_max_timeout': value => $rpc_response_max_timeout;
}
# DEFAULT/ovs_intergation_bridge was deprecated in favor of
# ovs/intergation_bridge. Make sure to purge the old parameter
neutron_dhcp_agent_config {
'DEFAULT/ovs_integration_bridge': ensure => 'absent'
}
if $ovsdb_connection =~ /^ssl:/ {
$req_ssl_opts = {
'ovsdb_agent_ssl_key_file' => $ovsdb_agent_ssl_key_file,

6
manifests/server.pp
View File

@ -349,12 +349,6 @@ class neutron::server (
'ovs/igmp_snooping_enable': value => $igmp_snooping_enable;
}
# DEFAULT/ovs_intergation_bridge was deprecated in favor of
# ovs/intergation_bridge. Make sure to purge the old parameter
neutron_config {
'DEFAULT/ovs_integration_bridge': ensure => 'absent'
}
if $server_package {
package { 'neutron-server':
ensure => $package_ensure,