From: Ansis Atteka <aatteka@nicira.com>
Date: Fri, 9 Mar 2012 02:41:57 +0000 (-0800)
Subject: Revert "ovs-monitor-ipsec: Detect correctly IPSEC configuration changes"
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=1f69acbe0079b539276a429973b6df8083352cf0

Revert "ovs-monitor-ipsec: Detect correctly IPSEC configuration changes"

This reverts commit 5e2a9988bb7853cad67a36e869d532d9d2f4533a.

Signed-off-by: Ansis Atteka <aatteka@nicira.com>
---

diff --git a/debian/ovs-monitor-ipsec b/debian/ovs-monitor-ipsec
index fc69268f7..ac2cd7e17 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