From: Scott Baker <bakers@cs.arizona.edu>
Date: Thu, 5 Mar 2009 01:25:33 +0000 (+0000)
Subject: use existing private keys when creating authorities if they are present
X-Git-Tag: sfa-0.9-0@14641~610
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=a689ec1ceaf00ecad04fef020085e93de9d84d50

use existing private keys when creating authorities if they are present
---

diff --git a/geni/util/hierarchy.py b/geni/util/hierarchy.py
index cbaa699b..d262ddcf 100644
--- a/geni/util/hierarchy.py
+++ b/geni/util/hierarchy.py
@@ -166,8 +166,12 @@ class Hierarchy():
             if errno == 17:
                 pass
 
-        pkey = Keypair(create = True)
-        pkey.save_to_file(privkey_filename)
+        if os.path.exists(privkey_filename):
+            print "using existing key", privkey_filename, "for authority", hrn
+            pkey = Keypair(filename = privkey_filename)
+        else:
+            pkey = Keypair(create = True)
+            pkey.save_to_file(privkey_filename)
 
         gid = self.create_gid(hrn, create_uuid(), pkey)
         gid.save_to_file(gid_filename, save_parents=True)