Browse Source

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
tags/16.1.0
Tobias Urdin Takashi Kajinami 2 weeks ago
parent
commit
22bd117c9d
2 changed files with 5 additions and 9 deletions
  1. +1
    -9
      manifests/agents/ml2/ovs.pp
  2. +4
    -0
      releasenotes/notes/remove-ovs-of_interface-74c3e0c85c5b622e.yaml

+ 1
- 9
manifests/agents/ml2/ovs.pp View File

@@ -170,9 +170,6 @@
#
# DEPRECATED
#
# [*of_interface*]
# (optional) This option is deprecated an has no effect
#
# [*ovsdb_interface*]
# (optional) The interface for interacting with the OVSDB
# Allowed values: vsctl, native
@@ -212,7 +209,6 @@ class neutron::agents::ml2::ovs (
$minimize_polling = $::os_service_default,
$tunnel_csum = $::os_service_default,
# DEPRECATED
$of_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':
purge => $purge_config,
}
@@ -306,6 +298,7 @@ class neutron::agents::ml2::ovs (
}
neutron_agent_ovs {
'ovs/ovsdb_interface': ensure => absent;
'ovs/of_interface': ensure => absent;
}

neutron_agent_ovs {
@@ -324,7 +317,6 @@ class neutron::agents::ml2::ovs (
'ovs/integration_bridge': value => $integration_bridge;
'ovs/datapath_type': value => $datapath_type;
'ovs/vhostuser_socket_dir': value => $vhostuser_socket_dir;
'ovs/of_interface': value => $of_interface;
'securitygroup/enable_security_group': value => $enable_security_group;
}



+ 4
- 0
releasenotes/notes/remove-ovs-of_interface-74c3e0c85c5b622e.yaml View File

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

Loading…
Cancel
Save