CA-37154: vswitch: Use MAC address of tagged PIF for VLAN fake-bridge

[openvswitch] / vswitchd / ovs-vswitchd.conf.5.in

diff --git a/vswitchd/ovs-vswitchd.conf.5.in b/vswitchd/ovs-vswitchd.conf.5.in
index c53c4d4d5c9c390f03e719a830fd184e2b10b4bf..5c4a092f1598424d3b9206596ed4c8734c28cf23 100644 (file)
--- a/vswitchd/ovs-vswitchd.conf.5.in
+++ b/vswitchd/ovs-vswitchd.conf.5.in
@@ -353,7 +353,7 @@ since the switch will attempt to send them out the input port.
 Disabling learning for the VLAN will cause the switch to correctly
 send the packet out all ports configured for that VLAN.  If Open
 vSwitch is being used as an intermediate switch learning can be disabled
-by setting the key \fBvlan.\fIbrname\fB.learning-disable=\fIvid\fR
+by setting the key \fBvlan.\fIbrname\fB.disable-learning=\fIvid\fR
 to the mirrored VLAN.
 .ST "Example"
 The following \fBovs\-vswitchd\fR configuration copies all frames received
@@ -470,7 +470,7 @@ used.
 .PP
 By default, 1 out of every 400 packets is sent to the configured sFlow
 collector.  To override this, set \fBsflow.\fIbridge\fB.sampling\fR to
-the number of switched packets out of which 1, on average, will be
+the number of switched packets out of which one, on average, will be
 sent to the sFlow collector, e.g. a value of 1 sends every packet to
 the collector, a value of 2 sends 50% of the packets to the collector,
 and so on.
@@ -482,6 +482,15 @@ sFlow collectors, by default every 30 seconds.  To override this, set
 By default, \fBovs\-vswitchd\fR sends the first 128 bytes of sampled
 packets to sFlow collectors.  To override this, set
 \fBsflow.\fIbridge\fB.header\fR to a size in bytes.
+.PP
+The sFlow module must be able to report an ``agent address'' to sFlow
+collectors, which should be an IP address for the Open vSwitch that is
+persistent and reachable over the network, if possible.  If a
+local IP is configured as \fBbridge.\fIbridge\fB.controller.ip\fR,
+then that IP address is used by default.  To override this default,
+set \fBsflow.\fIbridge\fB.agent\fR to the name of a network device, in
+which case the IP address set on that device is used.  If no IP
+address can be determined either way, sFlow is disabled.
 .SS "Remote Management"
 A \fBovs\-vswitchd\fR instance may be remotely managed by a controller that
 supports the OpenFlow Management Protocol, such as NOX.  This