A prog2-höz tartozó friss repo anyagok itt elérhetőek: https://git.iit.bme.hu/prog2

You need to sign in or sign up before continuing.
Commit 3616ce21 by Guba Sándor

changing emulator from hardcoded to parameter

parent 1170966d
description "IK Cloud Django Development Server"
start on runlevel [2345]
stop on runlevel [!2345]
respawn
respawn limit 30 30
setuid cloud
chdir /home/cloud/vmdriver
script
. /home/cloud/.virtualenvs/vmdriver/local/bin/postactivate
exec /home/cloud/.virtualenvs/vmdriver/bin/celery -A vmcelery worker --loglevel=info > /home/cloud/log
end script
...@@ -20,6 +20,7 @@ class VMInstance: ...@@ -20,6 +20,7 @@ class VMInstance:
name, name,
vcpu, vcpu,
memory_max, memory_max,
emulator='/usr/bin/kvm',
memory=None, memory=None,
cpu_share=100, cpu_share=100,
arch="x86_64", arch="x86_64",
...@@ -49,6 +50,7 @@ class VMInstance: ...@@ -49,6 +50,7 @@ class VMInstance:
seclabel_mode - libvirt security mode (selinux, apparmor) seclabel_mode - libvirt security mode (selinux, apparmor)
''' '''
self.name = name self.name = name
self.emulator = emulator
self.vcpu = vcpu self.vcpu = vcpu
self.cpu_share = cpu_share self.cpu_share = cpu_share
self.memory_max = memory_max self.memory_max = memory_max
...@@ -70,7 +72,8 @@ class VMInstance: ...@@ -70,7 +72,8 @@ class VMInstance:
@classmethod @classmethod
def deserialize(cls, desc): def deserialize(cls, desc):
desc['disk_list'] = [VMDisk.deserialize(d) for d in desc['disk_list']] desc['disk_list'] = [VMDisk.deserialize(d) for d in desc['disk_list']]
desc['network_list'] = [VMNetwork.deserialize(n) for n in desc['network_list']] desc['network_list'] = [VMNetwork.deserialize(
n) for n in desc['network_list']]
return cls(**desc) return cls(**desc)
def build_xml(self): def build_xml(self):
...@@ -98,7 +101,7 @@ class VMInstance: ...@@ -98,7 +101,7 @@ class VMInstance:
'enable': "yes" if self.boot_menu else "no"}) 'enable': "yes" if self.boot_menu else "no"})
# Devices # Devices
devices = ET.SubElement(xml_top, 'devices') devices = ET.SubElement(xml_top, 'devices')
ET.SubElement(devices, 'emulator').text = '/usr/bin/kvm' ET.SubElement(devices, 'emulator').text = self.emulator
for disk in self.disk_list: for disk in self.disk_list:
devices.append(disk.build_xml()) devices.append(disk.build_xml())
for network in self.network_list: for network in self.network_list:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment