[ovs-dev] [PATCH] ovs-ctl: Fix implementation of --extra-dbs.

Henry Mai hmai at nicira.com
Fri Oct 19 17:32:49 UTC 2012


On Fri, Oct 19, 2012 at 10:26 AM, Ben Pfaff <blp at nicira.com> wrote:
> From: Henry Mai <hmai at nicira.com>
>
> 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.
> ---
> Henry, can I get your Signed-off-by: on this?
>
>  AUTHORS                 |    1 +
>  ovsdb/ovsdb-server.1.in |   10 +++++-----
>  utilities/ovs-ctl.in    |    6 +++---
>  3 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/AUTHORS b/AUTHORS
> index 1ed8676..4687865 100644
> --- a/AUTHORS
> +++ b/AUTHORS
> @@ -30,6 +30,7 @@ Gaetano Catalli         gaetano.catalli at gmail.com
>  Giuseppe Lettieri       g.lettieri at iet.unipi.it
>  Glen Gibb               grg at stanford.edu
>  Gurucharan Shetty       gshetty at nicira.com
> +Henry Mai               hmai at nicira.com
>  Hao Zheng               hzheng at nicira.com
>  Ian Campbell            Ian.Campbell at citrix.com
>  Isaku Yamahata          yamahata at valinux.co.jp
> diff --git a/ovsdb/ovsdb-server.1.in b/ovsdb/ovsdb-server.1.in
> index b4b6eb6..242c98b 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
> diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
> index 2aa6398..2ead004 100755
> --- a/utilities/ovs-ctl.in
> +++ b/utilities/ovs-ctl.in
> @@ -206,9 +206,9 @@ start_ovsdb () {
>          set "$@" -vconsole:emer -vsyslog:err -vfile:info
>          set "$@" --remote=punix:"$DB_SOCK"
>          set "$@" --remote=db:Open_vSwitch,Open_vSwitch,manager_options
> -        set "$@" --private-key=db:SSL,private_key
> -        set "$@" --certificate=db:SSL,certificate
> -        set "$@" --bootstrap-ca-cert=db:SSL,ca_cert
> +        set "$@" --private-key=db:Open_vSwitch,SSL,private_key
> +        set "$@" --certificate=db:Open_vSwitch,SSL,certificate
> +        set "$@" --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert
>          start_daemon "$OVSDB_SERVER_PRIORITY" "$OVSDB_SERVER_WRAPPER" "$@" \
>              || return 1
>
> --
> 1.7.2.5
>

Signed-off-by: Henry Mai <hmai at nicira.com>



More information about the dev mailing list