From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Mon, 16 Mar 2009 18:11:31 +0000 (+0000)
Subject: Update instructions
X-Git-Tag: sfa-0.9-0@14641~571
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1d53363bdbaecfeefc63275c268dd60ea3167fcf;p=sfa.git

Update instructions
---

diff --git a/geni/aggregate.py b/geni/aggregate.py
index 343f1eb5..702c3bb1 100644
--- a/geni/aggregate.py
+++ b/geni/aggregate.py
@@ -40,7 +40,7 @@ class Aggregate(GeniServer):
     # @param key_file private key filename of registry
     # @param cert_file certificate filename containing public key (could be a GID file)     
 
-    def __init__(self, ip, port, key_file, cert_file, config = "/usr/share/geniwrapper/geni/util/geni_config"):
+    def __init__(self, ip, port, key_file, cert_file, config = "/etc/planetlab/geni_config"):
         GeniServer.__init__(self, ip, port, key_file, cert_file)
         self.key_file = key_file
         self.cert_file = cert_file
diff --git a/geni/plc.py b/geni/plc.py
index 6294b550..a1157907 100644
--- a/geni/plc.py
+++ b/geni/plc.py
@@ -14,10 +14,10 @@
 # is up to date and accurate.
 #
 # 1) Import the existing planetlab database, creating the
-#    appropriate geni records. This is done by running the "import.py" tool.
+#    appropriate geni records. This is done by running the "gimport.py" tool.
 #
 # 2) Create a "trusted_roots" directory and place the certificate of the root
-#    authority in that directory. Given the defaults in import.py, this
+#    authority in that directory. Given the defaults in gimport.py, this
 #    certificate would be named "planetlab.gid". For example,
 #
 #    mkdir trusted_roots; cp authorities/planetlab.gid trusted_roots/
diff --git a/geni/slicemgr.py b/geni/slicemgr.py
index 91389238..87fcc0f4 100644
--- a/geni/slicemgr.py
+++ b/geni/slicemgr.py
@@ -39,7 +39,7 @@ class SliceMgr(GeniServer):
     # @param key_file private key filename of registry
     # @param cert_file certificate filename containing public key (could be a GID file)     
 
-    def __init__(self, ip, port, key_file, cert_file, config = "/usr/share/geniwrapper/geni/util/geni_config"):
+    def __init__(self, ip, port, key_file, cert_file, config = os.getcwd() + "/geni/util/geni_config"):
         GeniServer.__init__(self, ip, port, key_file, cert_file)
         self.key_file = key_file
         self.cert_file = cert_file