projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath-protocol: Remove #include <linux/netlink.h>.
[openvswitch]
/
debian
/
ovs-monitor-ipsec
diff --git
a/debian/ovs-monitor-ipsec
b/debian/ovs-monitor-ipsec
index 444b23417117f291ce5419535e5d943abc349e59..ac2cd7e1777da8d3f3e42d7a75a113f4e0cfdaf3 100755
(executable)
--- a/
debian/ovs-monitor-ipsec
+++ b/
debian/ovs-monitor-ipsec
@@
-413,9
+413,10
@@
def update_ipsec(ipsec, interfaces, new_interfaces):
def get_ssl_cert(data):
for ovs_rec in data["Open_vSwitch"].rows.itervalues():
def get_ssl_cert(data):
for ovs_rec in data["Open_vSwitch"].rows.itervalues():
- ssl = ovs_rec.ssl
- if ssl and ssl.certificate and ssl.private_key:
- return (ssl.certificate, ssl.private_key)
+ if ovs_rec.ssl:
+ ssl = ovs_rec.ssl[0]
+ if ssl.certificate and ssl.private_key:
+ return (ssl.certificate, ssl.private_key)
return None
return None
@@
-436,7
+437,8
@@
def main():
ovs.daemon.handle_args(args)
global root_prefix
ovs.daemon.handle_args(args)
global root_prefix
- root_prefix = args.root_prefix
+ if args.root_prefix:
+ root_prefix = args.root_prefix
remote = args.database
schema_file = "%s/vswitch.ovsschema" % ovs.dirs.PKGDATADIR
remote = args.database
schema_file = "%s/vswitch.ovsschema" % ovs.dirs.PKGDATADIR