From: Ben Pfaff Date: Fri, 4 Sep 2009 20:35:36 +0000 (-0700) Subject: vswitch: Document that fail-open is enabled by default. X-Git-Tag: v0.90.6~26 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7983f00289c5b0d384ea99543d990d4f3d0d2639;p=sliver-openvswitch.git vswitch: Document that fail-open is enabled by default. The vswitchd.conf manpage said that fail-open is disabled by default. This is wrong: it is enabled by default. This commit fixes the documentation. CC: Sujatha Sumanth --- diff --git a/vswitchd/ovs-vswitchd.conf.5.in b/vswitchd/ovs-vswitchd.conf.5.in index 2eb49c135..f6fef9c72 100644 --- a/vswitchd/ovs-vswitchd.conf.5.in +++ b/vswitchd/ovs-vswitchd.conf.5.in @@ -524,7 +524,8 @@ the connection to the controller stays down long enough, no packets can pass through the switch at all. .IP The first of these that is set takes effect. -If the value is \fBstandalone\fR, \fBovs\-vswitchd\fR will take over +If the value is \fBstandalone\fR, or if neither of these settings +is set, \fBovs\-vswitchd\fR will take over responsibility for setting up flows when no message has been received from the controller for three times the inactivity probe interval (see above). In this mode, @@ -533,9 +534,8 @@ MAC-learning switch. \fBovs\-vswitchd\fR will continue to retry connecting to the controller in the background and, when the connection succeeds, it discontinues its standalone behavior. .IP -If this option is set to \fBsecure\fR, or if neither of these settings -is set, \fBovs\-vswitchd\fR will not set up flows on its own when the -controller connection fails. +If this option is set to \fBsecure\fR, \fBovs\-vswitchd\fR will not +set up flows on its own when the controller connection fails. .IP "\fBbridge.\fIname\fB.controller.max-backoff=\fIsecs\fR" Sets the maximum time between attempts to connect to the controller to \fIsecs\fR, which must be at least 1. The actual interval between