diff options
| author | gasperfele@fri1.uni-lj.si <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414> | 2016-12-18 13:51:00 +0000 |
|---|---|---|
| committer | gasperfele@fri1.uni-lj.si <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414> | 2016-12-18 13:51:00 +0000 |
| commit | 68353d621ed92f28c49312f938a2c2d7a051bbd5 (patch) | |
| tree | 238b5b0275c58fe53a0fe7b12c875cd8e6b7f256 | |
| parent | 5d333259666b671f6be9ef4f99dbc91ec72b843c (diff) | |
commit before fixing the snmp_agent_uptime task
git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@369 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414
| -rwxr-xr-x | kpov_judge/create_disk_images.py | 2 | ||||
| -rw-r--r-- | kpov_judge/tasks/isc_dhcp_live_boot/task.py | 13 | ||||
| -rw-r--r-- | kpov_judge/tasks/public_ip_ssh/task.py | 6 |
3 files changed, 8 insertions, 13 deletions
diff --git a/kpov_judge/create_disk_images.py b/kpov_judge/create_disk_images.py index 73646f9..09f74a2 100755 --- a/kpov_judge/create_disk_images.py +++ b/kpov_judge/create_disk_images.py @@ -118,6 +118,8 @@ if __name__ == '__main__': else: try_automount = True templates[disk['name']] = g + lock_fp.write(" templates[{}] = {}\n".format( + disk['name'], disk)) all_disks[computer['name']][disk['name']] = snap g.launch() mounted = set() diff --git a/kpov_judge/tasks/isc_dhcp_live_boot/task.py b/kpov_judge/tasks/isc_dhcp_live_boot/task.py index b7dfbee..15d150e 100644 --- a/kpov_judge/tasks/isc_dhcp_live_boot/task.py +++ b/kpov_judge/tasks/isc_dhcp_live_boot/task.py @@ -49,7 +49,7 @@ computers = { { 'name': 'student-DHCPServer', }, { 'name': 'bootable_usb', - 'options':{'readonly': True}, + 'options':{'readonly': False}, 'parts': [ {'dev': 'sdb1', 'path':'/mnt'} ], }, #{ 'name': 'CDROM', @@ -214,16 +214,9 @@ def task_check(results, params): def prepare_disks(templates, task_params, global_params): # d = templates['simpleArbiterDhcp'] d = templates['student-DHCPServer'] - s = """# use this exact config for your booting clients. -# search path for the c32 support libraries (libcom32, libutil etc.) -path -include menu.cfg -default vesamenu.c32 -prompt 0 -timeout 0 -# {}""".format(task_params['TFTP_STRING']) + s = """# {}""".format(task_params['TFTP_STRING']) d = templates['bootable_usb'] - d.write('/mnt/syslinux.cfg', s) + d.write_append('/mnt/syslinux.cfg', s) d = templates['simpleArbiterGW'] s = """auto lo iface lo inet loopback diff --git a/kpov_judge/tasks/public_ip_ssh/task.py b/kpov_judge/tasks/public_ip_ssh/task.py index 9640b27..b8f1d87 100644 --- a/kpov_judge/tasks/public_ip_ssh/task.py +++ b/kpov_judge/tasks/public_ip_ssh/task.py @@ -30,9 +30,9 @@ computers = { networks = { 'net1': {'public': True}, 'net2': {'public': True} } params_meta = { - 'peer_ip': {'descriptions': {'si': 'Naslov ssh strežnika'}, 'w': True, 'public':True, 'type': 'IP', 'generated': False}, - 'peer_user': {'descriptions': {'si': 'ime uporabnika'}, 'w': False, 'public': True, 'type': 'username', 'generated': True}, - 'peer_passwd': {'descriptions': {'si': 'geslo uporabnika'}, 'w': False, 'public': True, 'type': 'password', 'generated': True}, + 'peer_ip': {'descriptions': {'si': u'Naslov ssh strežnika'}, 'w': True, 'public':True, 'type': 'IP', 'generated': False}, + 'peer_user': {'descriptions': {'si': u'ime uporabnika'}, 'w': False, 'public': True, 'type': 'username', 'generated': True}, + 'peer_passwd': {'descriptions': {'si': u'geslo uporabnika'}, 'w': False, 'public': True, 'type': 'password', 'generated': True}, } def task(peer_ip, peer_user, peer_passwd): |