Skip to content

Commit

Permalink
docs: Consistently suggest /etc/openvswitch/conf.db as location for db.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
blp committed Feb 10, 2011
1 parent 5692e38 commit 028415b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions INSTALL.Linux
Original file line number Diff line number Diff line change
Expand Up @@ -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
=======
Expand All @@ -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 \
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion REPORTING-BUGS
Original file line number Diff line number Diff line change
Expand Up @@ -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".

Expand Down

0 comments on commit 028415b

Please sign in to comment.