summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-10 18:58:28 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-10 19:08:11 +0000
commit7f50323da4259c5e27f8dae72b5f02dababb7a99 (patch)
treeab5a5e58f2c1e898253204e23bf6ffd19b1cc543 /deploy
parent3e469e46e9766b1b4d443167e64e2887140c107c (diff)
deploy: Fix: remove storage files explicitly
Previous change [1] tried to move the responsibility of removing storage files (raw, iso) from our python scripts to libvirt. Although this works as expected for non-root invocations, like Armband deploys, it fails to remove raw files in Fuel@OPNFV deploys. Work around this by keeping both mechanisms (libvirt managed + python explicit handling). Related-bug: ARMBAND-128 [1] https://gerrit.opnfv.org/gerrit/#/c/22447 Change-Id: Ib846cd6071705b71d98824385835d724c729fd78 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit aa912dc6691fba23c0827108f6a20296942e1ac0)
Diffstat (limited to 'deploy')
-rw-r--r--deploy/environments/execution_environment.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/deploy/environments/execution_environment.py b/deploy/environments/execution_environment.py
index 3812902aa..7a0b4744e 100644
--- a/deploy/environments/execution_environment.py
+++ b/deploy/environments/execution_environment.py
@@ -47,6 +47,8 @@ class ExecutionEnvironment(object):
log('Deleting VM %s with disks %s' % (vm_name, disk_files))
exec_cmd('virsh destroy %s' % vm_name, False)
exec_cmd('virsh undefine --managed-save --remove-all-storage %s' % vm_name, False)
+ for file in disk_files:
+ delete(file)
def overwrite_xml(self, vm_xml, vm_definition_overwrite):
if not vm_definition_overwrite: