aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAnsis Atteka <aatteka@nicira.com>2012-03-08 18:41:57 -0800
committerAnsis Atteka <aatteka@nicira.com>2012-03-08 18:41:57 -0800
commit1f69acbe0079b539276a429973b6df8083352cf0 (patch)
tree2d42c3e7c917ba8b3dee1c5c0ba664ba539512c4 /debian
parent5e2a9988bb7853cad67a36e869d532d9d2f4533a (diff)
Revert "ovs-monitor-ipsec: Detect correctly IPSEC configuration changes"
This reverts commit 5e2a9988bb7853cad67a36e869d532d9d2f4533a. Signed-off-by: Ansis Atteka <aatteka@nicira.com>
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/ovs-monitor-ipsec7
1 files changed, 3 insertions, 4 deletions
diff --git a/debian/ovs-monitor-ipsec b/debian/ovs-monitor-ipsec
index fc69268f..ac2cd7e1 100755
--- a/debian/ovs-monitor-ipsec
+++ b/debian/ovs-monitor-ipsec
@@ -216,10 +216,12 @@ path certificate "%s";
# The peer's certificate comes to us in PEM format as a string.
# Write that string to a file for Racoon to use.
- f = open(root_prefix + vals["peer_cert_file"], "w")
+ peer_cert_file = "%s/ovs-%s.pem" % (self.cert_dir, host)
+ f = open(root_prefix + peer_cert_file, "w")
f.write(vals["peer_cert"])
f.close()
+ vals["peer_cert_file"] = peer_cert_file
self.cert_hosts[host] = vals
self.commit()
@@ -487,11 +489,8 @@ def main():
vlog.warn("no valid SSL entry for %s" % name)
continue
- peer_cert_name = "ovs-%s.pem" % (options.get("remote_ip"))
entry["certificate"] = ssl_cert[0]
entry["private_key"] = ssl_cert[1]
- entry["peer_cert_file"] = (Racoon.cert_dir + "/" +
- peer_cert_name)
new_interfaces[name] = entry