openstack
/
puppet-neutron
Code Issues Proposed changes

Remove OVS of_interface 

This was deprecated in Pike and can now be removed since
it doesn't have any effect either.

Change-Id: I84baf1b5b84d5c9887f827bf62086dccf0434719
This commit is contained in:
Tobias Urdin 2020-02-05 10:52:40 +01:00 committed by Takashi Kajinami
parent 3568ccf3d7
commit 22bd117c9d
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/agents/ml2/ovs.pp
View File

@ -170,9 +170,6 @@
# #
# DEPRECATED # DEPRECATED
# #
# [*of_interface*]
# (optional) This option is deprecated an has no effect
#
# [*ovsdb_interface*] # [*ovsdb_interface*]
# (optional) The interface for interacting with the OVSDB # (optional) The interface for interacting with the OVSDB
# Allowed values: vsctl, native # Allowed values: vsctl, native
@ -212,7 +209,6 @@ class neutron::agents::ml2::ovs (
$minimize_polling = $::os_service_default, $minimize_polling = $::os_service_default,
$tunnel_csum = $::os_service_default, $tunnel_csum = $::os_service_default,
# DEPRECATED # DEPRECATED
$of_interface = undef,
$ovsdb_interface = undef, $ovsdb_interface = undef,
) { ) {
@ -263,10 +259,6 @@ class neutron::agents::ml2::ovs (
} }
} }
if $of_interface {
warning('of_interface is deprecated and will be removed in the future')
}
resources { 'neutron_agent_ovs': resources { 'neutron_agent_ovs':
purge => $purge_config, purge => $purge_config,
} }
@ -306,6 +298,7 @@ class neutron::agents::ml2::ovs (
} }
neutron_agent_ovs { neutron_agent_ovs {
'ovs/ovsdb_interface': ensure => absent; 'ovs/ovsdb_interface': ensure => absent;
'ovs/of_interface': ensure => absent;
} }
neutron_agent_ovs { neutron_agent_ovs {
@ -324,7 +317,6 @@ class neutron::agents::ml2::ovs (
'ovs/integration_bridge': value => $integration_bridge; 'ovs/integration_bridge': value => $integration_bridge;
'ovs/datapath_type': value => $datapath_type; 'ovs/datapath_type': value => $datapath_type;
'ovs/vhostuser_socket_dir': value => $vhostuser_socket_dir; 'ovs/vhostuser_socket_dir': value => $vhostuser_socket_dir;
'ovs/of_interface': value => $of_interface;
'securitygroup/enable_security_group': value => $enable_security_group; 'securitygroup/enable_security_group': value => $enable_security_group;
} }

4
releasenotes/notes/remove-ovs-of_interface-74c3e0c85c5b622e.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The parameter neutron::agents::ml2::ovs::of_interface is now removed.