Remove clean up of [DEFAULT] ovs_integration_bridge
This logic was added during Victoria cycle[1], and has been kept for 4 cycles. So we can safely assume the old parmaeter is removed during upgrade. [1] 802da636e95a44663c272834cb43e4a4faf3c42d Change-Id: Iaadc6313d50d283dece737290604b2253578dd3d
This commit is contained in:
parent
df0d55cf78
commit
612d367242
@ -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,
|
||||
|
@ -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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user