From: Stefan Sicleru <stefan.sicleru@enea.com>
Date: Mon, 26 Sep 2016 12:09:09 +0000 (+0200)
Subject: deploy: fix: remove storage files during cleanup
X-Git-Tag: danube.1.RC1~118^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F47%2F22447%2F1;p=fuel.git

deploy: fix: remove storage files during cleanup

Remove old disks through virsh instead of calling os.delete()
methods so that the cleanup phase would succeed within a non-root
setup. [1]

Related-bug: ARMBAND-128

[1] https://gerrit.opnfv.org/gerrit/#/c/19491/

Change-Id: I90007edf014c7e15a68b9a334fcaffaa127ee4ab
Signed-off-by: Stefan Sicleru <stefan.sicleru@enea.com>
---

diff --git a/deploy/environments/execution_environment.py b/deploy/environments/execution_environment.py
index af0e130dd..3812902aa 100644
--- a/deploy/environments/execution_environment.py
+++ b/deploy/environments/execution_environment.py
@@ -46,9 +46,7 @@ class ExecutionEnvironment(object):
                     disk_files.append(source_file)
         log('Deleting VM %s with disks %s' % (vm_name, disk_files))
         exec_cmd('virsh destroy %s' % vm_name, False)
-        exec_cmd('virsh undefine %s' % vm_name, False)
-        for file in disk_files:
-            delete(file)
+        exec_cmd('virsh undefine --managed-save --remove-all-storage %s' % vm_name, False)
 
     def overwrite_xml(self, vm_xml, vm_definition_overwrite):
         if not vm_definition_overwrite: