mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 22:35:15 +00:00
Code Issues Releases Wiki Activity

ovn-nbctl: Take default database target from OVN_NB_DB in environment.

Browse Source 
This makes life easier for testing at the point you start to separate your
environment into multiple machines.

Also work on the manpage a little.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Alex Wang <alexw@nicira.com>
This commit is contained in:
Ben Pfaff
2015-06-13 18:02:02 -07:00
parent b59de254f2
commit d75ef07f40
3 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ovn/ovn-nbctl.8.xml
View File

@@ -182,20 +182,36 @@
</dl> </dl>
<h1>Options</h1> <h1>Options</h1>
<p><code>-d</code> <var>database</var> | <code>--db</code> <var>database</var></p>
<p><code>-h</code> | <code>--help</code></p> <dl>
<p><code>-o</code> | <code>--options</code></p> <dt><code>-d</code> <var>database</var></dt>
<p><code>-V</code> | <code>--version</code></p> <dt><code>--db</code> <var>database</var></dt>
<dd>
The OVSDB database remote to contact. If the <env>OVN_NB_DB</env>
environment variable is set, its value is used as the default.
Otherwise, the default is <code>unix:@RUNDIR@/db.sock</code>, but this
default is unlikely to be useful outside of single-machine OVN test
environments.
</dd>
<dt><code>-h</code> | <code>--help</code></dt>
<dt><code>-o</code> | <code>--options</code></dt>
<dt><code>-V</code> | <code>--version</code></dt>
</dl>
<h1>Logging options</h1> <h1>Logging options</h1>
<p><code>-v</code><var>spec</var>, <code>--verbose=</code><var>spec</var></p> <dl>
<p><code>-v</code>, <code>--verbose</code></p> <dt><code>-v</code><var>spec</var>, <code>--verbose=</code><var>spec</var></dt>
<p><code>--log-file</code>[<code>=</code><var>file</var>]</p> <dt><code>-v</code>, <code>--verbose</code></dt>
<p><code>--syslog-target=</code><var>host</var><code>:</code><var>port</var></p> <dt><code>--log-file</code>[<code>=</code><var>file</var>]</dt>
<dt><code>--syslog-target=</code><var>host</var><code>:</code><var>port</var></dt>
</dl>
<h1>PKI configuration (required to use SSL)</h1> <h1>PKI configuration (required to use SSL)</h1>
<p><code>-p</code>, <code>--private-key=</code><var>file</var> file with private key</p> <dl>
<p><code>-c</code>, <code>--certificate=</code><var>file</var> file with certificate for private key</p> <dt><code>-p</code>, <code>--private-key=</code><var>file</var> file with private key</dt>
<p><code>-C</code>, <code>--ca-cert=</code><var>file</var> file with peer CA certificate</p> <dt><code>-c</code>, <code>--certificate=</code><var>file</var> file with certificate for private key</dt>
<dt><code>-C</code>, <code>--ca-cert=</code><var>file</var> file with peer CA certificate</dt>
</dl>
</manpage> </manpage>

5
ovn/ovn-nbctl.c
View File

@@ -771,7 +771,10 @@ default_db(void)
{ {
static char *def; static char *def;
if (!def) { if (!def) {
def = xasprintf("unix:%s/db.sock", ovs_rundir()); def = getenv("OVN_NB_DB");
if (!def) {
def = xasprintf("unix:%s/db.sock", ovs_rundir());
}
} }
return def; return def;
} }

2
python/build/nroff.py
View File

@@ -65,7 +65,7 @@ def inlineXmlToNroff(node, font, to_upper=False):
else: else:
return textToNroff(node.data, font) return textToNroff(node.data, font)
elif node.nodeType == node.ELEMENT_NODE: elif node.nodeType == node.ELEMENT_NODE:
if node.tagName in ['code', 'em', 'option']: if node.tagName in ['code', 'em', 'option', 'env']:
s = r'\fB' s = r'\fB'
for child in node.childNodes: for child in node.childNodes:
s += inlineXmlToNroff(child, r'\fB') s += inlineXmlToNroff(child, r'\fB')