openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cloudinit: Fixed broken testsuite 

Signed-off-by: Athina Plaskasoviti <athina.plaskasoviti@gmail.com>
This commit is contained in:
Athina Plaskasoviti 2019-07-08 08:53:36 +03:00 committed by Cole Robinson
parent 0e5b1b3048
commit dadaf8eb45
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
virtinst/install/installerinject.py
View File

@ -58,7 +58,7 @@ def _run_iso_commands(iso, tempdir, cloudinit=False):
log.debug("cmd output: %s", output)
def _perform_generic_injections(injections, scratchdir, media, cb, cloudinit=False):
def _perform_generic_injections(injections, scratchdir, media, cb, **kwargs):
if not injections:
return
@ -76,17 +76,17 @@ def _perform_generic_injections(injections, scratchdir, media, cb, cloudinit=Fal
filename, dst, media)
shutil.copy(filename, os.path.join(tempdir, dst))
return cb(media, tempdir, cloudinit)
return cb(media, tempdir, **kwargs)
finally:
shutil.rmtree(tempdir)
def perform_initrd_injections(initrd, injections, scratchdir, cloudinit=False):
def perform_initrd_injections(initrd, injections, scratchdir):
"""
Insert files into the root directory of the initial ram disk
"""
_perform_generic_injections(injections, scratchdir, initrd,
_run_initrd_commands, cloudinit)
_run_initrd_commands)
def perform_cdrom_injections(injections, scratchdir, cloudinit=False):
@ -100,7 +100,7 @@ def perform_cdrom_injections(injections, scratchdir, cloudinit=False):
try:
_perform_generic_injections(injections, scratchdir, iso,
_run_iso_commands, cloudinit)
_run_iso_commands, cloudinit=cloudinit)
except Exception: # pragma: no cover
os.unlink(iso)
raise