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-23 18:43:42 +01:00
commit d5a7f8ef59
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
uncloud/hack/main.py
View file

@ -1,4 +1,5 @@
import argparse import argparse
import logging
from uncloud.hack.vm import VM from uncloud.hack.vm import VM
from uncloud.hack.config import Config from uncloud.hack.config import Config
@ -22,11 +23,11 @@ arg_parser.add_argument('--run-dns-ra', action='store_true',
help="Provide router advertisements and DNS resolution via dnsmasq") help="Provide router advertisements and DNS resolution via dnsmasq")
arg_parser.add_argument('--use-sudo', help="Use sudo for command requiring root!", action='store_true') arg_parser.add_argument('--use-sudo', help="Use sudo for command requiring root!", action='store_true')
log = logging.getLogger(__name__)
def main(arguments): def main(arguments):
print(arguments) log.debug("args={}".format(arguments))
config = Config(arguments) config = Config(arguments)
if arguments['create_vm']: if arguments['create_vm']:

5
uncloud/hack/net.py
View file

@ -37,11 +37,7 @@ class VXLANBridge(object):
self.config['vni_hex'] = "{:x}".format(vni) self.config['vni_hex'] = "{:x}".format(vni)
self.config['multicast_address'] = self.multicast_network[vni] self.config['multicast_address'] = self.multicast_network[vni]
#try:
self.config['route_network'] = ipaddress.IPv6Network(route) self.config['route_network'] = ipaddress.IPv6Network(route)
#except Exception as e:
# print("Ahhhhhhhhhhhhhhhhh, die: {}".format(e))
self.config['route'] = route self.config['route'] = route
self.config['uplinkdev'] = uplinkdev self.config['uplinkdev'] = uplinkdev
@ -69,7 +65,6 @@ class VXLANBridge(object):
def _execute_cmd(self, cmd_string, **kwargs): def _execute_cmd(self, cmd_string, **kwargs):
cmd = cmd_string.format(**self.config, **kwargs) cmd = cmd_string.format(**self.config, **kwargs)
log.info("Executing: {}".format(cmd)) log.info("Executing: {}".format(cmd))
print("Executing: {}".format(cmd))
subprocess.run(cmd.split()) subprocess.run(cmd.split())
class ManagementBridge(VXLANBridge): class ManagementBridge(VXLANBridge):