Merge branch 'master' into sqlalchemy

[sfa.git] / config / sfa-config-tty

diff --git a/config/sfa-config-tty b/config/sfa-config-tty
index 9b0377b..4008cd1 100755 (executable)
--- a/config/sfa-config-tty
+++ b/config/sfa-config-tty
@@ -12,18 +12,18 @@ def validator(validated_variables):
 #        errStr="PLC_API_MAINTENANCE_USER=%s cannot be the same as PLC_ROOT_USER=%s"%(maint_user,root_user)
 #        raise plc_config.ConfigurationException(errStr)
 
-usual_variables = ["SFA_REGISTRY_ROOT_AUTH",
-                   "SFA_REGISTRY_LEVEL1_AUTH",
-                   "SFA_REGISTRY_HOST", 
-                   "SFA_AGGREGATE_HOST",
-                   "SFA_SM_HOST",
-                   "SFA_PLC_USER",
-                   "SFA_PLC_PASSWORD",
-                   "SFA_PLC_DB_HOST",
-                   "SFA_PLC_DB_USER",
-                   "SFA_PLC_DB_PASSWORD",
-                   "SFA_PLC_URL",
-                   ]
+usual_variables = [
+    "SFA_GENERIC_FLAVOUR",
+    "SFA_INTERFACE_HRN",
+    "SFA_REGISTRY_ROOT_AUTH",
+    "SFA_REGISTRY_HOST", 
+    "SFA_AGGREGATE_HOST",
+    "SFA_SM_HOST",
+    "SFA_DB_HOST",
+    "SFA_PLC_URL",
+    "SFA_PLC_USER",
+    "SFA_PLC_PASSWORD",
+    ]
 
 configuration={ \
     'name':'sfa',