summaryrefslogtreecommitdiff
path: root/ovn/controller-vtep
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2018-04-23 13:04:28 -0500
committerBen Pfaff <blp@ovn.org>2018-05-09 14:40:49 -0700
commitc33fa581129e535f9f6acc5bfdd4d1de1a283a82 (patch)
tree4d9f53cccacbd248ddec9da4fe4f877cf6412f1e /ovn/controller-vtep
parentd45d99646c37bbfdb504aeb7a0f1f9a5a584506c (diff)
downloadopenvswitch-c33fa581129e535f9f6acc5bfdd4d1de1a283a82.tar.gz
Expose missing --peer-ca-cert and SSL options in usage and manpages.
Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ovn/controller-vtep')
-rw-r--r--ovn/controller-vtep/ovn-controller-vtep.8.xml9
-rw-r--r--ovn/controller-vtep/ovn-controller-vtep.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/ovn/controller-vtep/ovn-controller-vtep.8.xml b/ovn/controller-vtep/ovn-controller-vtep.8.xml
index 7540b5823..ca9b082a0 100644
--- a/ovn/controller-vtep/ovn-controller-vtep.8.xml
+++ b/ovn/controller-vtep/ovn-controller-vtep.8.xml
@@ -19,6 +19,15 @@
database (see <code>vtep</code>(5)) over the OVSDB protocol.
</p>
+ <h2>PKI Options</h2>
+ <p>
+ PKI configuration is required in order to use SSL for the connections to
+ the VTEP and Southbound databases.
+ </p>
+ <xi:include href="lib/ssl.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
+ <xi:include href="lib/ssl-bootstrap.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
+ <xi:include href="lib/ssl-peer-ca-cert.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
+
<h1>Configuration</h1>
<p>
<code>ovn-controller-vtep</code> retrieves its configuration
diff --git a/ovn/controller-vtep/ovn-controller-vtep.c b/ovn/controller-vtep/ovn-controller-vtep.c
index c1c2e68cb..1fc6c8b2d 100644
--- a/ovn/controller-vtep/ovn-controller-vtep.c
+++ b/ovn/controller-vtep/ovn-controller-vtep.c
@@ -254,7 +254,7 @@ Options:\n\
-o, --options list available options\n\
-V, --version display version information\n\
", program_name, program_name, default_db(), default_db());
- stream_usage("database", true, false, false);
+ stream_usage("database", true, false, true);
daemon_usage();
vlog_usage();
exit(EXIT_SUCCESS);