X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fconfig_wifilab.py;h=4da5c9da43ed463cbbea7b8017d5f6345bb937c4;hb=daa6101bf7c504d89de2eb6bbd06821e2f550539;hp=20c6f9cf5ac4826fb72111e176a5bed30a371ae3;hpb=10fc693e10cb435ad1e5058805c9431d0861a5b8;p=tests.git

diff --git a/system/config_wifilab.py b/system/config_wifilab.py
index 20c6f9c..4da5c9d 100644
--- a/system/config_wifilab.py
+++ b/system/config_wifilab.py
@@ -235,6 +235,7 @@ def slices ():
 
 def plc () :
     return { 
+        'index' : index,
         'name' : 'wifilab',
         # as of yet, not sure we can handle foreign hosts, but this is required though
         'hostname' : 'wlab24.inria.fr',
@@ -242,18 +243,20 @@ def plc () :
         # 'vservername': 'somename'
         # 'vserverip': '138.96.250.131'
         'role' : 'root',
-        'PLC_ROOT_USER' : 'root@wlab24.inria.fr',
-        'PLC_ROOT_PASSWORD' : 'test++',
-        'PLC_NAME' : 'WifiLab',
-        'PLC_MAIL_ENABLED':'true',
-        'PLC_MAIL_SUPPORT_ADDRESS' : 'thierry.parmentelat@inria.fr',
-        'PLC_DB_HOST' : 'wlab24.inria.fr',
-        'PLC_API_HOST' : 'wlab24.inria.fr',
-        'PLC_WWW_HOST' : 'wlab24.inria.fr',
-        'PLC_BOOT_HOST' : 'wlab24.inria.fr',
-        'PLC_NET_DNS1' : '138.96.0.10',
-        'PLC_NET_DNS2' : '138.96.0.11',
-        'PLC_DNS_ENABLED' : 'false',
+        'settings': {
+            'PLC_ROOT_USER' : 'root@wlab24.inria.fr',
+            'PLC_ROOT_PASSWORD' : 'test++',
+            'PLC_NAME' : 'WifiLab',
+            'PLC_MAIL_ENABLED':'true',
+            'PLC_MAIL_SUPPORT_ADDRESS' : 'thierry.parmentelat@inria.fr',
+            'PLC_DB_HOST' : 'wlab24.inria.fr',
+            'PLC_API_HOST' : 'wlab24.inria.fr',
+            'PLC_WWW_HOST' : 'wlab24.inria.fr',
+            'PLC_BOOT_HOST' : 'wlab24.inria.fr',
+            'PLC_NET_DNS1' : '138.96.0.10',
+            'PLC_NET_DNS2' : '138.96.0.11',
+            'PLC_DNS_ENABLED' : 'false',
+        },
         'sites' : sites(),
         'keys' : keys(),
         'initscripts': initscripts(),
@@ -261,4 +264,7 @@ def plc () :
     }
 
 def config (plc_specs,options):
+    print "config_wifilab is obsolete .."
+    import sys
+    sys.exit(1)
     return plc_specs + [ plc() ]