summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorGary Kotton <gkotton@vmware.com>2013-09-23 00:16:38 -0700
committerGary Kotton <gkotton@vmware.com>2013-12-17 06:50:51 -0800
commit5d84150eeaaf8539686989c418e36e1877cef42e (patch)
treeab8e99b880f2f957c3bb5b5c6977eee5557fa126 /etc
parent6b7aae5b8d5da5144d8ef9b9c8fb83a0b98ac2c9 (diff)
downloadnova-5d84150eeaaf8539686989c418e36e1877cef42e.tar.gz
Add configurable 120s timeout ovs-vsctl calls
By default, or with a secs of 0, ovs−vsctl waits forever for a response from the database. This option limits runtime to approximately 120 seconds. If the timeout expires, ovs−vsctl will exit with a SIGALRM signal. (A timeout would normally happen only if the database cannot be contacted, or if the system is overloaded.) The user can update the timeout by setting the ovs_vsctl_timeout configuration variable. DocImpact Closes-bug: 1229018 Change-Id: Ica64ae98fb6162d2119021972127a82417d5ee7a
Diffstat (limited to 'etc')
-rw-r--r--etc/nova/nova.conf.sample5
1 files changed, 5 insertions, 0 deletions
diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample
index ddaf472730..8c1036413c 100644
--- a/etc/nova/nova.conf.sample
+++ b/etc/nova/nova.conf.sample
@@ -1153,6 +1153,11 @@
# dropped. (string value)
#iptables_drop_action=DROP
+# Amount of time, in seconds, that ovs_vsctl should wait for a
+# response from the database. 0 is to wait forever. (integer
+# value)
+#ovs_vsctl_timeout=120
+
#
# Options defined in nova.network.manager