added a global_params parameter to prepare_disks so that the task_name, username and task_url are pre-entered on the arbiters

git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@351 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414

1 files changed, 3 insertions, 4 deletions

diff --git a/kpov_judge/tasks/set_ip_dhcp_hostname/task.py b/kpov_judge/tasks/set_ip_dhcp_hostname/task.py
index 5cf5b54..63ba12a 100644
--- a/kpov_judge/tasks/set_ip_dhcp_hostname/task.py
+++ b/kpov_judge/tasks/set_ip_dhcp_hostname/task.py
@@ -72,7 +72,7 @@ params_meta = {
 }
 
 def task(IP_DHCP, Hostname_DHCP, IP_static, MAC_static, IP_dhcp_static):
-    import pxssh
+    from pexpect import pxssh
     import pexpect
     results = dict()
     # check hostname of DHCP
@@ -97,9 +97,8 @@ def task_check(results, params):
         score += 3
     return score, hints
 
-def prepare_disks(templates, params):
+def prepare_disks(templates, task_params, global_params):
 #    d = templates['simpleArbiterDhcp']
 #   create config for static_DHCP
 #   set static_DHCP hostname
-    pass
-
+    write_default_config(templates['simpleArbiterDhcp'], global_params)