| Message ID | 1599002805-103574-1-git-send-email-hzhou@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,1/4] ovn-nbctl.8.xml: Fix section OVN_NBCTL_OPTIONS. | expand |
On Wed, Sep 2, 2020 at 4:57 AM Han Zhou <hzhou@ovn.org> wrote: > The section was placed at wrong postion. This patch fixes it. > > Signed-off-by: Han Zhou <hzhou@ovn.org> > Acked-by: Numan Siddique <numans@ovn.org> Thanks Numan > --- > utilities/ovn-nbctl.8.xml | 53 > +++++++++++++++++++++++++---------------------- > 1 file changed, 28 insertions(+), 25 deletions(-) > > diff --git a/utilities/ovn-nbctl.8.xml b/utilities/ovn-nbctl.8.xml > index 18bf90e..07447d2 100644 > --- a/utilities/ovn-nbctl.8.xml > +++ b/utilities/ovn-nbctl.8.xml > @@ -1320,31 +1320,6 @@ > wait at all. Use the <code>sync</code> command to override this > behavior. > </p> > - > - <p> > - User can set one or more <env>OVN_NBCTL_OPTIONS</env> options in > - environment variable. Under the Bourne shell this might be > - done like this: > - </p> > - > - <pre fixed="yes"> > - OVN_NBCTL_OPTIONS="--db=unix:nb1.ovsdb --no-leader-only" > - </pre> > - > - <p> > - When <env>OVN_NBCTL_OPTIONS</env> is set, <code>ovn-nbctl</code> > - automatically and transparently uses the environment variable to > - execute its commands. However user can still over-ride > environment > - options by passing different in cli. > - </p> > - > - <p> > - When the environment variable is no longer needed, unset it, > e.g.: > - </p> > - > - <pre fixed="yes"> > - unset OVN_NBCTL_OPTIONS > - </pre> > </dd> > > <dt><code>--db</code> <var>database</var></dt> > @@ -1387,6 +1362,34 @@ > connection string to connect. This allows user to specify the > preferred order, which is particularly useful for testing. > </dd> > + > + <dt><code>OVN_NBCTL_OPTIONS</code></dt> > + <dd> > + <p> > + User can set one or more <env>OVN_NBCTL_OPTIONS</env> options in > + environment variable. Under the Bourne shell this might be > + done like this: > + </p> > + > + <pre fixed="yes"> > + OVN_NBCTL_OPTIONS="--db=unix:nb1.ovsdb --no-leader-only" > + </pre> > + > + <p> > + When <env>OVN_NBCTL_OPTIONS</env> is set, <code>ovn-nbctl</code> > + automatically and transparently uses the environment variable to > + execute its commands. However user can still over-ride > environment > + options by passing different in cli. > + </p> > + > + <p> > + When the environment variable is no longer needed, unset it, > e.g.: > + </p> > + > + <pre fixed="yes"> > + unset OVN_NBCTL_OPTIONS > + </pre> > + </dd> > </dl> > > <h2>Daemon Options</h2> > -- > 2.1.0 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > >
On Mon, Sep 7, 2020 at 10:52 AM Numan Siddique <numans@ovn.org> wrote: > > > On Wed, Sep 2, 2020 at 4:57 AM Han Zhou <hzhou@ovn.org> wrote: > >> The section was placed at wrong postion. This patch fixes it. >> >> Signed-off-by: Han Zhou <hzhou@ovn.org> >> > > Acked-by: Numan Siddique <numans@ovn.org> > > Thanks > Numan > > Thanks Numan. I applied this to master. --- >> utilities/ovn-nbctl.8.xml | 53 >> +++++++++++++++++++++++++---------------------- >> 1 file changed, 28 insertions(+), 25 deletions(-) >> >> diff --git a/utilities/ovn-nbctl.8.xml b/utilities/ovn-nbctl.8.xml >> index 18bf90e..07447d2 100644 >> --- a/utilities/ovn-nbctl.8.xml >> +++ b/utilities/ovn-nbctl.8.xml >> @@ -1320,31 +1320,6 @@ >> wait at all. Use the <code>sync</code> command to override >> this >> behavior. >> </p> >> - >> - <p> >> - User can set one or more <env>OVN_NBCTL_OPTIONS</env> options >> in >> - environment variable. Under the Bourne shell this might be >> - done like this: >> - </p> >> - >> - <pre fixed="yes"> >> - OVN_NBCTL_OPTIONS="--db=unix:nb1.ovsdb --no-leader-only" >> - </pre> >> - >> - <p> >> - When <env>OVN_NBCTL_OPTIONS</env> is set, >> <code>ovn-nbctl</code> >> - automatically and transparently uses the environment variable >> to >> - execute its commands. However user can still over-ride >> environment >> - options by passing different in cli. >> - </p> >> - >> - <p> >> - When the environment variable is no longer needed, unset it, >> e.g.: >> - </p> >> - >> - <pre fixed="yes"> >> - unset OVN_NBCTL_OPTIONS >> - </pre> >> </dd> >> >> <dt><code>--db</code> <var>database</var></dt> >> @@ -1387,6 +1362,34 @@ >> connection string to connect. This allows user to specify the >> preferred order, which is particularly useful for testing. >> </dd> >> + >> + <dt><code>OVN_NBCTL_OPTIONS</code></dt> >> + <dd> >> + <p> >> + User can set one or more <env>OVN_NBCTL_OPTIONS</env> options >> in >> + environment variable. Under the Bourne shell this might be >> + done like this: >> + </p> >> + >> + <pre fixed="yes"> >> + OVN_NBCTL_OPTIONS="--db=unix:nb1.ovsdb --no-leader-only" >> + </pre> >> + >> + <p> >> + When <env>OVN_NBCTL_OPTIONS</env> is set, >> <code>ovn-nbctl</code> >> + automatically and transparently uses the environment variable >> to >> + execute its commands. However user can still over-ride >> environment >> + options by passing different in cli. >> + </p> >> + >> + <p> >> + When the environment variable is no longer needed, unset it, >> e.g.: >> + </p> >> + >> + <pre fixed="yes"> >> + unset OVN_NBCTL_OPTIONS >> + </pre> >> + </dd> >> </dl> >> >> <h2>Daemon Options</h2> >> -- >> 2.1.0 >> >> _______________________________________________ >> dev mailing list >> dev@openvswitch.org >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev >> >>
diff --git a/utilities/ovn-nbctl.8.xml b/utilities/ovn-nbctl.8.xml index 18bf90e..07447d2 100644 --- a/utilities/ovn-nbctl.8.xml +++ b/utilities/ovn-nbctl.8.xml @@ -1320,31 +1320,6 @@ wait at all. Use the <code>sync</code> command to override this behavior. </p> - - <p> - User can set one or more <env>OVN_NBCTL_OPTIONS</env> options in - environment variable. Under the Bourne shell this might be - done like this: - </p> - - <pre fixed="yes"> - OVN_NBCTL_OPTIONS="--db=unix:nb1.ovsdb --no-leader-only" - </pre> - - <p> - When <env>OVN_NBCTL_OPTIONS</env> is set, <code>ovn-nbctl</code> - automatically and transparently uses the environment variable to - execute its commands. However user can still over-ride environment - options by passing different in cli. - </p> - - <p> - When the environment variable is no longer needed, unset it, e.g.: - </p> - - <pre fixed="yes"> - unset OVN_NBCTL_OPTIONS - </pre> </dd> <dt><code>--db</code> <var>database</var></dt> @@ -1387,6 +1362,34 @@ connection string to connect. This allows user to specify the preferred order, which is particularly useful for testing. </dd> + + <dt><code>OVN_NBCTL_OPTIONS</code></dt> + <dd> + <p> + User can set one or more <env>OVN_NBCTL_OPTIONS</env> options in + environment variable. Under the Bourne shell this might be + done like this: + </p> + + <pre fixed="yes"> + OVN_NBCTL_OPTIONS="--db=unix:nb1.ovsdb --no-leader-only" + </pre> + + <p> + When <env>OVN_NBCTL_OPTIONS</env> is set, <code>ovn-nbctl</code> + automatically and transparently uses the environment variable to + execute its commands. However user can still over-ride environment + options by passing different in cli. + </p> + + <p> + When the environment variable is no longer needed, unset it, e.g.: + </p> + + <pre fixed="yes"> + unset OVN_NBCTL_OPTIONS + </pre> + </dd> </dl> <h2>Daemon Options</h2>
The section was placed at wrong postion. This patch fixes it. Signed-off-by: Han Zhou <hzhou@ovn.org> --- utilities/ovn-nbctl.8.xml | 53 +++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 25 deletions(-)