docs: Consistently suggest /etc/openvswitch/conf.db as location for db.

Our Debian and XenServer packages use /etc/openvswitch/conf.db as the
location for the database but some of the docs suggested
/etc/ovs-vswitchd.conf.db.  This settles on the former consistently.
The manpage is still ovs-vswitchd.conf.db but I don't know what to do
about that.

diff --git a/INSTALL.Linux b/INSTALL.Linux
index f80e1c645fec5b30c5d438dd1df7a8c02f7529ae..9d69bd864d7cd7138b1ca694e4e33883848b59cf 100644 (file)
--- a/INSTALL.Linux
+++ b/INSTALL.Linux
@@ -240,7 +240,8 @@ Prerequisites section, follow the procedure below to build.
 
 7. Initialize the configuration database using ovsdb-tool, e.g.:
 
-      % ovsdb-tool create /usr/local/etc/ovs-vswitchd.conf.db vswitchd/vswitch.ovsschema
+      % mkdir -p /usr/local/etc/openvswitch
+      % ovsdb-tool create /usr/local/etc/openvswitch/conf.db vswitchd/vswitch.ovsschema
 
 Startup
 =======
@@ -253,7 +254,7 @@ installation, above, to listen on a Unix domain socket, to connect to
 any managers specified in the database itself, and to use the SSL
 configuration in the database:
 
-      % ovsdb-server /usr/local/etc/ovs-vswitchd.conf.db \
+      % ovsdb-server /usr/local/etc/openvswitch/conf.db \
                       --remote=punix:/usr/local/var/run/openvswitch/db.sock \
                       --remote=db:Open_vSwitch,managers \
                       --private-key=db:SSL,private_key \
@@ -305,7 +306,7 @@ also upgrade the database schema:
       - If you want to preserve the contents of your database, back it
         up first, then use "ovsdb-tool convert" to upgrade it, e.g.:
 
-        % ovsdb-tool convert /usr/local/etc/ovs-vswitchd.conf.db vswitchd/vswitch.ovsschema
+        % ovsdb-tool convert /usr/local/etc/openvswitch/conf.db vswitchd/vswitch.ovsschema
 
 4. Start the Open vSwitch daemons as described under "Building and
    Installing Open vSwitch for Linux" above.

diff --git a/REPORTING-BUGS b/REPORTING-BUGS
index 812bfba0fb1c6486db96a46591a298976fcfa1c8..86510d276cb2a10f78e732d05b17315f8d9a62ab 100644 (file)
--- a/REPORTING-BUGS
+++ b/REPORTING-BUGS
@@ -32,7 +32,7 @@ The following are also handy sometimes:
           your OS (e.g. "Centos 5.0").
 
         * The contents of the vswitchd configuration database (usually
-          /etc/ovs-vswitchd.conf.db).
+          /etc/openvswitch/conf.db).
 
         * The output of "ovs-dpctl show".