X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=debian%2Fovs-monitor-ipsec;h=ac2cd7e1777da8d3f3e42d7a75a113f4e0cfdaf3;hb=59d0f2c8a0a16ef5ebc35e815bd82605b70fa7e2;hp=444b23417117f291ce5419535e5d943abc349e59;hpb=0c13f5d505ba8817d2a883bdc056a6f45d68db18;p=openvswitch diff --git a/debian/ovs-monitor-ipsec b/debian/ovs-monitor-ipsec index 444b2341..ac2cd7e1 100755 --- 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(): - 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 @@ -436,7 +437,8 @@ def main(): 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