summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-04-18 00:36:33 +0000
committerGerrit Code Review <review@openstack.org>2018-04-18 00:36:33 +0000
commit482a9ed88034a4b9f3cd2d1e4d91bee10f594cdb (patch)
tree1ec84d0480aa4f95c68288d8f665ceb193a83b05
parentd015e84a6daeae109973b85d322af50b85f58a22 (diff)
parent806d96cbbe45fcd473935e777a2a56037fbb9d12 (diff)
Merge "Override ovsdb_timeout default value in ovs_cleanup tool"
-rw-r--r--neutron/cmd/ovs_cleanup.py5
-rw-r--r--releasenotes/notes/ovsdb_timeout_override_for_ovs_cleanup_tool-e6ed6db258d0819e.yaml15
2 files changed, 20 insertions, 0 deletions
diff --git a/neutron/cmd/ovs_cleanup.py b/neutron/cmd/ovs_cleanup.py
index 7472371..98c3b9f 100644
--- a/neutron/cmd/ovs_cleanup.py
+++ b/neutron/cmd/ovs_cleanup.py
@@ -26,6 +26,10 @@ from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants
26 26
27LOG = logging.getLogger(__name__) 27LOG = logging.getLogger(__name__)
28 28
29# Default ovsdb_timeout value for this script.
30# It allows to clean bridges with even thousands of ports.
31CLEANUP_OVSDB_TIMEOUT = 600
32
29 33
30def setup_conf(): 34def setup_conf():
31 """Setup the cfg for the clean up utility. 35 """Setup the cfg for the clean up utility.
@@ -39,6 +43,7 @@ def setup_conf():
39 l3_config.register_l3_agent_config_opts(l3_config.OPTS, conf) 43 l3_config.register_l3_agent_config_opts(l3_config.OPTS, conf)
40 agent_config.register_interface_driver_opts_helper(conf) 44 agent_config.register_interface_driver_opts_helper(conf)
41 agent_config.register_interface_opts() 45 agent_config.register_interface_opts()
46 conf.set_default("ovsdb_timeout", CLEANUP_OVSDB_TIMEOUT, "OVS")
42 return conf 47 return conf
43 48
44 49
diff --git a/releasenotes/notes/ovsdb_timeout_override_for_ovs_cleanup_tool-e6ed6db258d0819e.yaml b/releasenotes/notes/ovsdb_timeout_override_for_ovs_cleanup_tool-e6ed6db258d0819e.yaml
new file mode 100644
index 0000000..5cc762c
--- /dev/null
+++ b/releasenotes/notes/ovsdb_timeout_override_for_ovs_cleanup_tool-e6ed6db258d0819e.yaml
@@ -0,0 +1,15 @@
1---
2fixes:
3 - |
4 Fixes bug `1763604 <https://bugs.launchpad.net/neutron/+bug/1763604>`_.
5 Override default value of ``ovsdb_timeout`` config option in
6 ``neutron-ovs-cleanup`` script.
7 The default value is 10 seconds, but that is not enough for the
8 ``neutron-ovs-cleanup`` script when there are many ports to remove from
9 a single bridge, for example, 5000. Because of that, we now override the
10 default value for the config option to be 600 seconds (10 minutes).
11issues:
12 - |
13 In the case when the number of ports to clean up in a single bridge is
14 larger than about 10000, it might require an increase in the
15 ``ovsdb_timeout`` config option to some value higher than 600 seconds.