diff options
| author | Henry Mai <hmai@nicira.com> | 2012-10-19 10:22:42 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2012-10-19 10:41:53 -0700 |
| commit | 4206b80f6444ceef47ceb9e1a6b88a40eabacb1f (patch) | |
| tree | 895404c16f0518ccbd1f2164b8792acfbda4a8d2 /ovsdb | |
| parent | 4cceacb94cfc1d75a961d3d746d2ae369c397ae5 (diff) | |
ovs-ctl: Fix implementation of --extra-dbs.
Commit b4e8d1705 (ovsdb-server: Add support for multiple databases.)
added the --extra-dbs option to ovs-ctl but failed to add a specific
database name to the SSL options passed to ovsdb-server. This meant
that ovsdb-server would fail to start if --extra-dbs were actually
used, because it didn't know which database to look in for the SSL
settings.
Signed-off-by: Henry Mai <hmai@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'ovsdb')
| -rw-r--r-- | ovsdb/ovsdb-server.1.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ovsdb/ovsdb-server.1.in b/ovsdb/ovsdb-server.1.in index b4b6eb62..242c98b5 100644 --- a/ovsdb/ovsdb-server.1.in +++ b/ovsdb/ovsdb-server.1.in @@ -93,11 +93,11 @@ configured remotes. The options described below for configuring the SSL public key infrastructure accept a special syntax for obtaining their configuration from the database. If any of these options is given -\fBdb:\fItable\fB,\fIcolumn\fR as its argument, then the actual file -name is read from the specified \fIcolumn\fR in \fItable\fR within the -\fBovsdb\-server\fR database. The \fIcolumn\fR must have type string -or set of strings. The first nonempty string in the table is taken as -the file name. (This means that ordinarily there should be at most +\fBdb:\fR[\fIdb\fB,\fR]\fItable\fB,\fIcolumn\fR as its argument, then the +actual file name is read from the specified \fIcolumn\fR in \fItable\fR +within the \fBovsdb\-server\fR database. The \fIcolumn\fR must have type +string or set of strings. The first nonempty string in the table is taken +as the file name. (This means that ordinarily there should be at most one row in \fItable\fR.) .so lib/ssl.man .so lib/ssl-bootstrap.man |