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/radius_mysql_pam/task.py b/kpov_judge/tasks/radius_mysql_pam/task.py
index 908ee49..7ea4b0c 100644
--- a/kpov_judge/tasks/radius_mysql_pam/task.py
+++ b/kpov_judge/tasks/radius_mysql_pam/task.py
@@ -98,7 +98,7 @@ params_meta = {
 }

 

 def task(IP_RS, RADIUS_SECRET, RADIUS_USERNAME, RADIUS_PASSWORD, MYSQL_DB_NAME, MYSQL_ADMIN_USER, MYSQL_ADMIN_PASSWORD, MYSQL_SEED):

-    import pxssh

+    from pexpect import pxssh

     import pexpect

     import random

     results = dict()

@@ -209,7 +209,6 @@ def task_check(results, params):
         print (results['login_test'],s)

     return score, hints

 

-def prepare_disks(templates, params):

-#    d = templates['simpleArbiterDhcp']

-    pass   

+def prepare_disks(templates, task_params, global_params):

+    write_default_config(templates['simpleArbiterDhcpGW'], global_params)