From 8c8f1d09c623a7f4a1ede41a7da2d1d721cc66d3 Mon Sep 17 00:00:00 2001 From: Justin Pettit Date: Wed, 11 Mar 2009 19:03:42 -0700 Subject: [PATCH] Allow ignoring "mgmt.controller" settings per bridge. By setting the "bridge..controller" key to an empty value, it is now possible to perform local switching, while allowing the rest of vswitchd to be remotely controlled. --- vswitchd/bridge.c | 2 +- vswitchd/vswitchd.conf.5 | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 2eb6b4c8..5f01afec 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -847,7 +847,7 @@ bridge_reconfigure_one(struct bridge *br) ofproto_flush_flows(br->ofproto); } - if (ctl) { + if (ctl && strlen(ctl) != 0) { const char *fail_mode; int max_backoff, probe; diff --git a/vswitchd/vswitchd.conf.5 b/vswitchd/vswitchd.conf.5 index 09921640..a6648ba1 100644 --- a/vswitchd/vswitchd.conf.5 +++ b/vswitchd/vswitchd.conf.5 @@ -405,7 +405,7 @@ id is generated each time \fBvswitchd\fR is started. .RE .SS "OpenFlow controller connectivity" If a remote manager is not configured, \fBvswitchd\fR will perform -all configured bridging and switching locally. It can also be configured +all configured bridging and switching locally. It can be configured to connect a given bridge to an external OpenFlow controller, such as NOX, by setting \fBbridge.\fIname\fB.controller\fR to one of the following forms: @@ -431,6 +431,11 @@ The specified TCP \fIport\fR (default: 6633) on the given remote \fBunix:\fIfile\fR The Unix domain server socket named \fIfile\fR. .PP +If the \fBbridge.\fIname\fB.controller\fR key is set without a value, +the bridge \fIname\fR will ignore a controller setting specified by +\fBmgmt.controller\fR. Instead, it will perform all configured bridging +and switching locally. +.PP When an external controller is configured, \fBbridge.\fIname\fB.secchan.options\fR may be used to pass arbitrary additional options to \fBsecchan\fR. Each value for this option is @@ -444,7 +449,6 @@ but not controller discovery (see \fBsecchan\fR(8) for more information on this terminology), the local bridge port must configured with an IP address by some entity outside \fBvswitch\fR, which will not itself configure an IP address on it. -.PP .SH "SEE ALSO" .BR vswitchd (8). -- 2.30.2