removed all _IP varaibles, _HOST variables now capture HOSTNAME and IP info

[sfa.git] / geni / util / geni_config

diff --git a/geni/util/geni_config b/geni/util/geni_config
index e70fe4a..0f9ff4a 100644 (file)
--- a/geni/util/geni_config
+++ b/geni/util/geni_config
@@ -3,27 +3,12 @@ GENI_BASE_DIR="/usr/share/geniwrapper/"
 
 # HRN
 # Human readable name for the interfaces
-GENI_INTERFACE_HRN="planetlab.us"   
+GENI_INTERFACE_HRN="plc"   
 
 
-## Aggregate Configuration
-#
-# Enable aggregate inteface
-# Enable the aggregate inteface.   
-GENI_AGGREGATE_ENABLED=1
-
-# Hostname
-# The fully qualified hostname of the aggregate server  
-GENI_AGGREGATE_HOSTNAME="localhost"
-
-# IP
-# Geni aggregate ip address   
-GENI_AGGREGATE_IP="127.0.0.1"
-
-# Port
-# Geni aggregate server port
-GENI_AGGREGATE_PORT=12346
-
+# API Debut
+# Are we logging
+GENI_API_DEBUG=1
 
 # Registry Configuration
 #
@@ -31,24 +16,50 @@ GENI_AGGREGATE_PORT=12346
 # Enable the registry interface 
 GENI_REGISTRY_ENABLE=1
 
+# Root Auth
+# The hrn of the registry's root auth
+GENI_REGISTRY_ROOT_AUTH="plc"
+
+# Level1 Auth
+# The hrn of the registry's level1 auth
+GENI_REGISTRY_LEVEL1_AUTH=""
+
 # Hostname
 # The fully qualified hostname of the registry server
-GENI_REGISTRY_HOSTNAME="localhost"
-
-# IP
-# Geni registry ip address 
-GENI_REGISTRY_IP="127.0.0.1"
+GENI_REGISTRY_HOST="localhost"
 
 # Port
 # Geni registry port
 GENI_REGISTRY_PORT=12345
 
+
+## Aggregate Configuration
+##
+## Enable aggregate inteface
+## Enable the aggregate inteface.
+GENI_AGGREGATE_ENABLED=1
+#
+## Hostname
+## The fully qualified hostname of the aggregate server
+GENI_AGGREGATE_HOST="localhost"
+#
+## Port
+## Geni aggregate server port
+GENI_AGGREGATE_PORT=12346
+
 # Slice Manager Configuration
 #
 # Enabled
 # Enable the slice manager  
 GENI_SM_ENABLED=1 
 
+# Host
+## The fully qualified hostname or IP address of the slice manager server
+GENI_SM_HOST="localhost"
+
+# Port
+# Geni slice manager server port  
+GENI_SM_PORT=12347
 
 # PLC Interace Access Configuration
 #