xenserver: Restore XS5.5 compatibility for vif script.

[openvswitch] / INSTALL.bridge

diff --git a/INSTALL.bridge b/INSTALL.bridge
index 76d180fe49d35aaa2bcff8a37dd3b0e0b566218b..75caaceebe3e71a436facc5632da5e62d1d5330b 100644 (file)
--- a/INSTALL.bridge
+++ b/INSTALL.bridge
@@ -42,20 +42,16 @@ to update system scripts to follow these steps.
    bridge interfaces), to ensure that the Open vSwitch kernel modules
    are loaded before the Linux kernel bridge module.
 
    bridge interfaces), to ensure that the Open vSwitch kernel modules
    are loaded before the Linux kernel bridge module.
 

-3. Create an initial version of the configuration file, for example
-   /etc/ovs-vswitchd.conf.  This file may be empty initially or may
-   contain add any valid configuration directives described in
-   ovs-vswitchd.conf(5).  However, it must exist when you start
-   ovs-vswitchd.
+3. Start ovsdb-server, ovs-vswitchd, and ovs-brcompatd, e.g.:

 
 

-   To create an empty configuration file:
+      % ovsdb-server /etc/ovs-vswitchd.conf.db \
+                --remote=punix:/var/run/ovsdb-server

 
 

-      % touch /etc/ovs-vswitchd.conf
+      % ovs-vswitchd --pidfile --detach -vANY:console:EMER \
+                unix:/var/run/ovsdb-server

 
 

-4. Start ovs-vswitchd and ovs-brcompatd, e.g.:
-
-      % ovs-vswitchd -P -D -vANY:console:EMER /etc/ovs-vswitchd.conf
-      % ovs-brcompatd -P -D -vANY:console:EMER /etc/ovs-vswitchd.conf
+      % ovs-brcompatd --pidfile --detach -vANY:console:EMER \
+                unix:/var/run/ovsdb-server

 
 5. Now you should be able to manage the Open vSwitch using brctl and
    related tools.  For example, you can create an Open vSwitch bridge,
 
 5. Now you should be able to manage the Open vSwitch using brctl and
    related tools.  For example, you can create an Open vSwitch bridge,


@@ -68,11 +64,7 @@ to update system scripts to follow these steps.
       % brctl show
 
    Each of these commands actually uses or modifies the Open vSwitch
       % brctl show
 
    Each of these commands actually uses or modifies the Open vSwitch

-   configuration file, then notifies the ovs-vswitchd daemon of the
-   change.  For example, after executing the commands above starting
-   from an empty configuration file, "cat /etc/ovs-vswitchd.conf"
-   should show that the configuration file now contains the following:
-
-      bridge.br0.port=br0
-      bridge.br0.port=eth0
-      bridge.br0.port=eth1
+   configuration database, then notifies the ovs-vswitchd daemon of
+   the change.  For example, after executing the commands above
+   starting from an empty configuration file, "ovs-vsctl list-ports
+   br0" should show that bridge br0 contains two ports, eth0 and eth1.