Merge branch 'master' into thgeneric

[sfa.git] / config / sfi_config

diff --git a/config/sfi_config b/config/sfi_config
index 8eef7a4..3314790 100644 (file)
--- a/config/sfi_config
+++ b/config/sfi_config
@@ -1,16 +1,24 @@
 # user-level configuration for sfi
 
 ### hrn of your authority
+# For instance, the hrn of a user at the Princeton site on PlanetLab (PLC)
+# would be plc.princeton.  Likewise if the user was part of the NYU site, the HRN
+# would be plc.nyu
 SFI_AUTH='plc.princeton'
-# or planetlab.us.arizona
 
 ### your user hrn
+# This is your authority.<your user name on PlanetLab>
 SFI_USER='plc.princeton.faiyaza'
-# or planetlab.us.arizona.Baker_Scott 
-# or planetlab.us.arizona.Hartman_John
+#
 
 ### where to find the registry
 SFI_REGISTRY='http://www.planet-lab.org:12345/'
 
 # where to find the slice manager
 SFI_SM='http://www.planet-lab.org:12347/'
+
+# where to find the geni aggregate manager
+# XX this should be handled by the slice manger
+# XX but we cant support it until the geni_am and sfa 
+# XX interfaces has been unified
+SFI_GENI_AM='http://www.planet-lab.org:12348'