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

add image format option

Browse source
This commit is contained in:
Nico Schottelius 2020-02-06 15:13:08 +01:00
parent 0e667b5262
commit aaf0114df1
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
uncloud/hack/main.py
View file

@ -30,6 +30,7 @@ arg_parser.add_argument('--list-vms', action='store_true')
arg_parser.add_argument('--memory', help="Size of memory (GB)", type=int) arg_parser.add_argument('--memory', help="Size of memory (GB)", type=int)
arg_parser.add_argument('--cores', help="Amount of CPU cores", type=int) arg_parser.add_argument('--cores', help="Amount of CPU cores", type=int)
arg_parser.add_argument('--image', help="Path (under hackprefix) to OS image") arg_parser.add_argument('--image', help="Path (under hackprefix) to OS image")
arg_parser.add_argument('--image-format', help="Image format: qcow2 or raw", choices=['raw', 'qcow2'])
arg_parser.add_argument('--uuid', help="VM UUID") arg_parser.add_argument('--uuid', help="VM UUID")
arg_parser.add_argument('--no-db', help="Disable connection to etcd. For local testing only!", action='store_true') arg_parser.add_argument('--no-db', help="Disable connection to etcd. For local testing only!", action='store_true')

7
uncloud/hack/vm.py
View file

@ -59,18 +59,23 @@ class VM(object):
self.uuid = self.config.arguments['uuid'] self.uuid = self.config.arguments['uuid']
self.memory = self.config.arguments['memory'] or '1024M' self.memory = self.config.arguments['memory'] or '1024M'
self.cores = self.config.arguments['cores'] or 1 self.cores = self.config.arguments['cores'] or 1
if self.config.arguments['image']: if self.config.arguments['image']:
self.image = os.path.join(self.hackprefix, self.config.arguments['image']) self.image = os.path.join(self.hackprefix, self.config.arguments['image'])
else: else:
self.image = None self.image = None
if self.config.arguments['image_format']:
self.image_format=self.config.arguments['image_format']
else:
self.image_format='qcow2'
# External components. # External components.
self.vmm = VMM(vmm_backend=self.hackprefix) self.vmm = VMM(vmm_backend=self.hackprefix)
self.mac = MAC(self.config) self.mac = MAC(self.config)
# Harcoded & generated values. # Harcoded & generated values.
self.owner = 'uncoud' self.owner = 'uncoud'
self.image_format='qcow2'
self.accel = 'kvm' self.accel = 'kvm'
self.threads = 1 self.threads = 1
self.ifup = os.path.join(self.hackprefix, "ifup.sh") self.ifup = os.path.join(self.hackprefix, "ifup.sh")