valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix ordering issue in the butterkvm module

Browse Source
This commit is contained in:
Thomas S Hatch 2011-03-31 23:20:20 -06:00
parent b5de9c97a3
commit b962ab8e5a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/modules/butterkvm.py
View File

@ -69,10 +69,11 @@ def _apply_overlay(vda, instance):
Use libguestfs to apply the overlay inder the specified instance to the
specified vda
'''
overlay = os.path.join(instance, 'overlay')
if not os.path.isdir(overlay):
return False
overlay = os.path.join(instance, 'overlay')
tar = os.path.join(tempfile.mkdtemp(), 'host.tgz')
tmp = tempfile.mkdtemp()
tar = os.path.join(tmp, 'host.tgz')
cwd = os.getcwd()
os.chdir(overlay)
t_cmd = 'tar cvzf ' + tar + ' *'
@ -80,7 +81,7 @@ def _apply_overlay(vda, instance):
os.chdir(cwd)
g_cmd = 'guestfish -i -a ' + vda + ' tgz-in ' + tar + ' /'
subprocess.call(g_cmd, shell=True)
shutil.rmtree(os.path.dirname(tar))
shutil.rmtree(os.path.dirname(tmp))
return True
def libvirt_creds():