amal/uncloud
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of code.ungleich.ch:uncloud/uncloud

Browse source
This commit is contained in:
Dominique Roux 2020-01-24 14:34:36 +01:00
commit 8cc58726d0
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
uncloud/hack/main.py
View file

@ -56,6 +56,7 @@ def main(arguments):
use_sudo=arguments['use_sudo']) use_sudo=arguments['use_sudo'])
vb._setup_vxlan() vb._setup_vxlan()
vb._setup_bridge() vb._setup_bridge()
vb._add_vxlan_to_bridge()
vb._route_network() vb._route_network()
if arguments['run_dns_ra']: if arguments['run_dns_ra']:

11
uncloud/hack/vm.py
View file

@ -36,8 +36,8 @@ class VM(object):
self.db = DB(self.config, prefix="/vm") self.db = DB(self.config, prefix="/vm")
#TODO: Select generic #TODO: Select generic
#self.hackprefix="/home/nico/vcs/uncloud/uncloud/hack/hackcloud" #TODO: Should be removed midterm self.hackprefix="/home/nico/vcs/uncloud/uncloud/hack/hackcloud" #TODO: Should be removed midterm
self.hackprefix="/home/rouxdo/Work/ungleich/uncloud/uncloud/hack/hackcloud" #TODO: Dominique testing #self.hackprefix="/home/rouxdo/Work/ungleich/uncloud/uncloud/hack/hackcloud" #TODO: Dominique testing
self.qemu="/usr/bin/qemu-system-x86_64" #TODO: should be in config self.qemu="/usr/bin/qemu-system-x86_64" #TODO: should be in config
self.accel="kvm" #TODO: should be config self.accel="kvm" #TODO: should be config
@ -67,14 +67,19 @@ class VM(object):
#self.vni_hex = "{:x}".format(self.config.arguments['vni']) #self.vni_hex = "{:x}".format(self.config.arguments['vni'])
self.bridgedev = "br{}".format("{:x}".format(self.config.arguments['vni'])) self.bridgedev = "br{}".format("{:x}".format(self.config.arguments['vni']))
#TODO: Enable sudo #TODO: Enable sudo -- FIXME!
if self.config.arguments['use_sudo']: if self.config.arguments['use_sudo']:
self.sudo = "sudo" self.sudo = "sudo"
else:
self.sudo = ""
self.mac=MAC(self.config) self.mac=MAC(self.config)
self.mac.create() self.mac.create()
self.vm['ifname'] = "uc{}".format(self.mac.to_str_format()) self.vm['ifname'] = "uc{}".format(self.mac.to_str_format())
# FIXME: TODO: turn this into a string and THEN
# .split() it later -- easier for using .format()
#self.vm['commandline'] = [ "{}".format(self.sudo), #self.vm['commandline'] = [ "{}".format(self.sudo),
self.vm['commandline'] = [ "{}".format(self.sudo), self.vm['commandline'] = [ "{}".format(self.sudo),
"{}".format(self.qemu), "{}".format(self.qemu),