projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vswitchd: Respect other_config:stp-enable port setting.
[openvswitch]
/
vswitchd
/
vswitch.xml
diff --git
a/vswitchd/vswitch.xml
b/vswitchd/vswitch.xml
index 13d24b69f47442f50e08640ffbc9435003fa47d9..a1b99f863af58825f643e6aec8783de1fb5e3061 100644
(file)
--- a/
vswitchd/vswitch.xml
+++ b/
vswitchd/vswitch.xml
@@
-802,8
+802,13
@@
<group title="Bonding Configuration">
<p>A port that has more than one interface is a ``bonded port.'' Bonding
<group title="Bonding Configuration">
<p>A port that has more than one interface is a ``bonded port.'' Bonding
- allows for load balancing and fail-over. Some kinds of bonding will
- work with any kind of upstream switch:</p>
+ allows for load balancing and fail-over.</p>
+
+ <p>
+ The following types of bonding will work with any kind of upstream
+ switch. On the upstream switch, do not configure the interfaces as a
+ bond:
+ </p>
<dl>
<dt><code>balance-slb</code></dt>
<dl>
<dt><code>balance-slb</code></dt>
@@
-815,7
+820,8
@@
<dt><code>active-backup</code></dt>
<dd>
Assigns all flows to one slave, failing over to a backup slave when
<dt><code>active-backup</code></dt>
<dd>
Assigns all flows to one slave, failing over to a backup slave when
- the active slave is disabled.
+ the active slave is disabled. This is the only bonding mode in which
+ interfaces may be plugged into different upstream switches.
</dd>
</dl>
</dd>
</dl>
@@
-834,6
+840,7
@@
<dt><code>stable</code></dt>
<dd>
<dt><code>stable</code></dt>
<dd>
+ <p>Deprecated and slated for removal in February 2013.</p>
<p>Attempts to always assign a given flow to the same slave
consistently. In an effort to maintain stability, no load
balancing is done. Uses a similar hashing strategy to
<p>Attempts to always assign a given flow to the same slave
consistently. In an effort to maintain stability, no load
balancing is done. Uses a similar hashing strategy to
@@
-890,7
+897,7
@@
<column name="bond_updelay">
<p>
<column name="bond_updelay">
<p>
- The number of milliseconds for which
carrier
must stay up on an
+ The number of milliseconds for which
the link
must stay up on an
interface before the interface is considered to be up. Specify
<code>0</code> to enable the interface immediately.
</p>
interface before the interface is considered to be up. Specify
<code>0</code> to enable the interface immediately.
</p>
@@
-903,7
+910,7
@@
</column>
<column name="bond_downdelay">
</column>
<column name="bond_downdelay">
- The number of milliseconds for which
carrier
must stay down on an
+ The number of milliseconds for which
the link
must stay down on an
interface before the interface is considered to be down. Specify
<code>0</code> to disable the interface immediately.
</column>
interface before the interface is considered to be down. Specify
<code>0</code> to disable the interface immediately.
</column>
@@
-956,12
+963,10
@@
</column>
</group>
</column>
</group>
- <group title="
SLB
Configuration">
+ <group title="
Rebalancing
Configuration">
<p>
These settings control behavior when a bond is in
<p>
These settings control behavior when a bond is in
- <code>balance-slb</code> mode, regardless of whether the bond was
- intentionally configured in SLB mode or it fell back to SLB mode
- because LACP negotiation failed.
+ <code>balance-slb</code> or <code>balance-tcp</code> mode.
</p>
<column name="other_config" key="bond-rebalance-interval"
</p>
<column name="other_config" key="bond-rebalance-interval"
@@
-970,7
+975,7
@@
successive attempts to rebalance the bond, that is, to move flows
from one interface on the bond to another in an attempt to keep usage
of each interface roughly equal. If zero, load balancing is disabled
successive attempts to rebalance the bond, that is, to move flows
from one interface on the bond to another in an attempt to keep usage
of each interface roughly equal. If zero, load balancing is disabled
- on the bond (
carrier status changes
still cause flows to move). If
+ on the bond (
link failure
still cause flows to move). If
less than 1000ms, the rebalance interval will be 1000ms.
</column>
</group>
less than 1000ms, the rebalance interval will be 1000ms.
</column>
</group>
@@
-1210,7
+1215,8
@@
</dd>
<dt><code>null</code></dt>
</dd>
<dt><code>null</code></dt>
- <dd>An ignored interface.</dd>
+ <dd>An ignored interface. Deprecated and slated for removal in
+ February 2013.</dd>
</dl>
</column>
</group>
</dl>
</column>
</group>
@@
-1764,6
+1770,13
@@
frame having an invalid interval.
</column>
frame having an invalid interval.
</column>
+ <column name="cfm_remote_opstate">
+ <p>When in extended mode, indicates the operational state of the
+ remote endpoint as either <code>up</code> or <code>down</code>. See
+ <ref column="other_config" key="cfm_opstate"/>.
+ </p>
+ </column>
+
<column name="cfm_health">
<p>
Indicates the health of the interface as a percentage of CCM frames
<column name="cfm_health">
<p>
Indicates the health of the interface as a percentage of CCM frames