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

diff --git a/geni/util/geni_config b/geni/util/geni_config
index 9aa23c9..0f9ff4a 100644 (file)
--- a/geni/util/geni_config
+++ b/geni/util/geni_config
@@ -5,6 +5,9 @@ GENI_BASE_DIR="/usr/share/geniwrapper/"
 # Human readable name for the interfaces
 GENI_INTERFACE_HRN="plc"   
 
+
+# API Debut
+# Are we logging
 GENI_API_DEBUG=1
 
 # Registry Configuration
@@ -23,11 +26,7 @@ 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
@@ -42,11 +41,7 @@ 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"
+GENI_AGGREGATE_HOST="localhost"
 #
 ## Port
 ## Geni aggregate server port
@@ -58,6 +53,13 @@ GENI_AGGREGATE_PORT=12346
 # 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
 #