From d3e8f24b4da66059058627168f3f71eaf7626a93 Mon Sep 17 00:00:00 2001 From: "gasperfele@fri1.uni-lj.si" Date: Thu, 9 Apr 2015 18:00:43 +0000 Subject: fixed disk template names git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@298 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414 --- kpov_judge/tasks/vlc_stream_rtp/task.py | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'kpov_judge/tasks/vlc_stream_rtp') diff --git a/kpov_judge/tasks/vlc_stream_rtp/task.py b/kpov_judge/tasks/vlc_stream_rtp/task.py index f292ed1..3838c12 100644 --- a/kpov_judge/tasks/vlc_stream_rtp/task.py +++ b/kpov_judge/tasks/vlc_stream_rtp/task.py @@ -7,8 +7,11 @@ instructions = { 'si':u""" -Postavi navidezni računalnik SimpleArbiter z diska simpleArbiter. Posodobi -datoteko /etc/apt/sources.list, preveri posodobitve in naloži VLC. +Postavi navidezni računalnik SimpleArbiter z diska simpleArbiter +ter StudentVLC z diska student-VLC. Poskrbi, da bosta na istem omrežju, od +koder bosta imela dostop tudi do Interneta +Na StudentVLC posodobi datoteko /etc/apt/sources.list, preveri posodobitve in +naloži VLC. Posnemi ali kako drugače ustvari film ter poskrbi, da bo film dostopen na lokalnem omrežju prek RTP z imenom toka {TOK} na naslovu {NASLOV}. @@ -16,8 +19,11 @@ Računaj, da bodo film lahko videli tvoji sošolci. Kršenje avtorskih pravic je pri reševanju te naloge strogo prepovedano. """, 'en':u""" -Set up a virtual computer SimpleArbiter from the simpleArbiter disk. -Update /etc/apt/sources.list, check the for updates and install VLC. +Set up a virtual computer called SimpleArbiter using the simpleArbiter disk and +a virtual computer called StudentVLC using the student-VLC disk. Make sure they +are on the same network and that they have access to the Internet. +On StundentVLC, update /etc/apt/sources.list, check the for updates and install +VLC. Record or otherwise create a movie and make sure the movie is avaliable on your local network via RTP with the name of the stream {TOK} at the address @@ -39,10 +45,25 @@ computers = { # 'parts': [{'dev': 'b1', 'path': '/cdrom'}], #}, ], - 'network_interfaces': [{'network': 'net1'}, {'network': 'test-net'}], + 'network_interfaces': [{'network': 'test-net'}], + 'flavor': 'm1.tiny', + 'config_drive': False + }, + 'StudentVLC': { + 'disks': [ + { 'name': 'student-VLC', + # attempt automount + }, + #{ 'name': 'CDROM', + # 'options': {'readonly': True}, + # 'parts': [{'dev': 'b1', 'path': '/cdrom'}], + #}, + ], + 'network_interfaces': [{'network': 'test-net'}], 'flavor': 'm1.tiny', 'config_drive': False } + } networks = { 'test-net': {'public': True} } -- cgit v1.2.1