[ovs-dev] [PATCH] Better document that ovs-vswitchd and ovs-openflowd are mutually exclusive.

Ben Pfaff blp at nicira.com
Tue Oct 20 16:57:44 UTC 2009


CC: Andreas Wundasm <andi at net.t-labs.tu-berlin.de>
---
 INSTALL.OpenFlow             |    5 +++++
 utilities/ovs-openflowd.8.in |    3 +++
 vswitchd/ovs-vswitchd.8.in   |    2 ++
 3 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/INSTALL.OpenFlow b/INSTALL.OpenFlow
index a1b7799..81cf6b5 100644
--- a/INSTALL.OpenFlow
+++ b/INSTALL.OpenFlow
@@ -136,6 +136,11 @@ OpenFlow switch.
    in an insecure manner.  Please see INSTALL.SSL for a description of
    how to connect securely using SSL.
 
+   Alternatively, you may run ovs-vswitchd in place of ovs-openflowd.
+   ovs-vswitchd uses a configuration file for configuration instead of
+   the command line.  Please refer to ovs-vswitchd(8) and
+   ovs-vswitchd.conf(5) for information on configuring ovs-vswitchd.
+
 7. If you are using in-band control with manual configuration, and the
    switch obtains its IP address dynamically, then you may now obtain
    the switch's IP address, e.g. by invoking a DHCP client.  The
diff --git a/utilities/ovs-openflowd.8.in b/utilities/ovs-openflowd.8.in
index 3d25574..3ca6d44 100644
--- a/utilities/ovs-openflowd.8.in
+++ b/utilities/ovs-openflowd.8.in
@@ -13,6 +13,9 @@ The \fBovs\-openflowd\fR program implements an OpenFlow switch using a
 flow-based datapath.  \fBovs\-openflowd\fR connects to an OpenFlow controller
 over TCP or SSL.
 
+\fBovs-openflowd\fR is mutually exclusive with \fBovs\-vswitchd\fR:
+only one of them may run at a time.
+
 The mandatory \fIdatapath\fR argument argument specifies the local datapath
 to relay.  It takes one of the following forms:
 
diff --git a/vswitchd/ovs-vswitchd.8.in b/vswitchd/ovs-vswitchd.8.in
index 8579421..0b51c29 100644
--- a/vswitchd/ovs-vswitchd.8.in
+++ b/vswitchd/ovs-vswitchd.8.in
@@ -52,6 +52,8 @@ Connectivity to an external OpenFlow controller, such as NOX.
 .
 .PP
 Only a single instance of \fBovs\-vswitchd\fR is intended to run at a time.
+Also, \fBovs\-vswitchd\fR is mutually exclusive with
+\fBovs-openflowd\fR: only one of them may run at a time.
 A single \fBovs\-vswitchd\fR can manage any number of switch instances, up
 to the maximum number of supported Open vSwitch datapaths.
 .PP
-- 
1.6.3.3





More information about the dev mailing list