From 317dadd6208aa7221dbd225c82a0fc5c98d33534 Mon Sep 17 00:00:00 2001
From: Andrew Evans tags and changed them to use
where appropriate (I hope).
---
vswitchd/vswitch.xml | 87 +++++++++++++++++++++++++-------------------
1 file changed, 49 insertions(+), 38 deletions(-)
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index e399eeea..6199938f 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -50,7 +50,7 @@
xs-system-uuid
.xs-system-uuid
xe host-list
.
bridge-id
xs-network-uuids
.xs-network-uuids
balance-tcp
, always taking into account L3 and L4
fields even if LACP negotiations are unsuccessful.
Slave selection decisions are made based on
- bond-stable-id
if set. Otherwise, OpenFlow port
- number is used. Decisions are consistent across all ovs-vswitchd
- instances with equivalent bond-stable-id
s.
Slave selection decisions are made based on if set. Otherwise,
+ OpenFlow port number is used. Decisions are consistent across all
+ ovs-vswitchd
instances with equivalent
+
+ values.
gre
remote_ip
, local_ip
, and
- in_key
. Note that if two ports are defined that are
- the same except one has an optional identifier and the other does
- not, the more specific one is matched first. in_key
- is considered more specific than local_ip
if a port
- defines one and another port defines the other. The following
- options may be specified in the column:
+ tunnel. Each tunnel must be uniquely identified by the
+ combination of ,
+ , and
+ . Note that if two ports
+ are defined that are the same except one has an optional
+ identifier and the other does not, the more specific one is
+ matched first. is considered
+ more specific than if a port
+ defines one and another port defines the other. The following
+ options may be specified in the column:
remote_ip
gre
) must be uniquely identified by the
- combination of remote_ip
and
- local_ip
. Note that if two ports are defined
- that are the same except one has an optional identifier and
+ combination of and
+ . Note that if two ports are
+ defined that are the same except one has an optional identifier and
the other does not, the more specific one is matched first.
- An authentication method of peer_cert
or
- psk
must be defined. The following options may
- be specified in the column:
+ An authentication method of
+ or must be defined. The
+ following options may be specified in the
+ column:
remote_ip
remote_ip
and
- local_ip
. If two ports are defined that are the same
- except one includes local_ip
and the other does not,
- the more specific one is matched first. CAPWAP support is not
+ identified by the combination of
+ and
+ . If two ports are defined
+ that are the same except one includes
+ and the other does not, the
+ more specific one is matched first. CAPWAP support is not
available on all platforms. Currently it is only supported in the
Linux kernel module with kernel versions >= 2.6.25. The following
options may be specified in the column:
@@ -1165,9 +1173,9 @@
- Key-value pairs that report port status. Supported status
- values are type
-dependent; some interfaces may not have
- a valid driver_name
, for example.
+ Key-value pairs that report port status. Supported status values are
+ -dependent; some interfaces may not have a valid
+ , for example.
The currently defined key-value pairs are:
remote_ip
.
- This could be an internal interface such as a bridge port.iface-id
xs-vif-uuid
.Additionally the following key-value pairs specifically @@ -1375,10 +1385,11 @@
bond-stable-id
stable
bond mode to
make slave selection decisions. Allocating
- bond-stable-id
s consistently across interfaces
- participating in a bond will guarantee consistent slave selection
- decisions across ovs-vswitchd instances when using
- stable
bonding mode.ovs-vswitchd
instances when using stable
+ bonding mode.
lacp-port-id