summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGurucharan Shetty <gshetty@nicira.com>2015-08-19 15:42:07 -0700
committerGurucharan Shetty <gshetty@nicira.com>2015-08-21 15:36:54 -0700
commit5bf6cbd6961f22a99df799ea0f3e816792ba42c3 (patch)
tree00c4919baac8e3691ad61c76d82da1a2f2d40879 /lib
parent36561090182f5bd90725f3724bbf4d9f60e8b8fa (diff)
downloadopenvswitch-5bf6cbd6961f22a99df799ea0f3e816792ba42c3.tar.gz
ovsdb-server: Add the ability to push peer-cert.
In OVN, ovsdb-server is the daemon that manages the databases and can be called as the central controller. So it would be nice for ovsdb-server to be able to push its self-signed certificate to all the other nodes where ovn-controller runs. Signed-off-by: Gurucharan Shetty <gshetty@nicira.com> Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/automake.mk1
-rw-r--r--lib/jsonrpc.c1
-rw-r--r--lib/ssl-bootstrap-syn.man2
-rw-r--r--lib/ssl-peer-ca-cert-syn.man2
4 files changed, 5 insertions, 1 deletions
diff --git a/lib/automake.mk b/lib/automake.mk
index 15a9373bb..20bf7c8f1 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -436,6 +436,7 @@ MAN_FRAGMENTS += \
lib/ssl-bootstrap.man \
lib/ssl-bootstrap-syn.man \
lib/ssl-peer-ca-cert.man \
+ lib/ssl-peer-ca-cert-syn.man \
lib/ssl.man \
lib/ssl-syn.man \
lib/table.man \
diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c
index ae51b4299..1e312a278 100644
--- a/lib/jsonrpc.c
+++ b/lib/jsonrpc.c
@@ -948,6 +948,7 @@ jsonrpc_session_run(struct jsonrpc_session *s)
reconnect_connect_failed(s->reconnect, time_msec(), error);
stream_close(s->stream);
s->stream = NULL;
+ s->last_error = error;
}
}
diff --git a/lib/ssl-bootstrap-syn.man b/lib/ssl-bootstrap-syn.man
index 9425321f5..c503645a9 100644
--- a/lib/ssl-bootstrap-syn.man
+++ b/lib/ssl-bootstrap-syn.man
@@ -1,2 +1,2 @@
.br
-[\fB\-\-bootstrap\-ca\-cert=\fIcacert.pem]
+[\fB\-\-bootstrap\-ca\-cert=\fIcacert.pem\fR]
diff --git a/lib/ssl-peer-ca-cert-syn.man b/lib/ssl-peer-ca-cert-syn.man
new file mode 100644
index 000000000..4a558eeb8
--- /dev/null
+++ b/lib/ssl-peer-ca-cert-syn.man
@@ -0,0 +1,2 @@
+.br
+[\fB\-\-peer\-ca\-cert=\fIpeer-cacert.pem\fR]