From 143022408c26f3c6a5f5c1eaf0dce8061242675a Mon Sep 17 00:00:00 2001 From: Szilard Cserey Date: Tue, 20 Oct 2015 14:18:37 +0200 Subject: Plugin config + bugfix + refactoring ignoring external repo errors during plugin installation refactoring import common Install only those plugins which have a yaml config file located under plugins folder collect puppet errors from all nodes Change-Id: I8d5248cf31c4877a6d59bfcfe62b43daf4ad43ef Signed-off-by: Szilard Cserey --- fuel/deploy/environments/execution_environment.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'fuel/deploy/environments/execution_environment.py') diff --git a/fuel/deploy/environments/execution_environment.py b/fuel/deploy/environments/execution_environment.py index 63be5cd11..38e5bcdf7 100644 --- a/fuel/deploy/environments/execution_environment.py +++ b/fuel/deploy/environments/execution_environment.py @@ -9,16 +9,13 @@ from lxml import etree - -import common from dha_adapters.libvirt_adapter import LibvirtAdapter -exec_cmd = common.exec_cmd -err = common.err -log = common.log -check_dir_exists = common.check_dir_exists -check_file_exists = common.check_file_exists -check_if_root = common.check_if_root +from common import ( + exec_cmd, + log, + delete, +) class ExecutionEnvironment(object): @@ -51,7 +48,7 @@ class ExecutionEnvironment(object): exec_cmd('virsh destroy %s' % vm_name, False) exec_cmd('virsh undefine %s' % vm_name, False) for file in disk_files: - exec_cmd('rm -f %s' % file) + delete(file) def define_vm(self, vm_name, temp_vm_file, disk_path): log('Creating VM %s with disks %s' % (vm_name, disk_path)) -- cgit 1.2.3-korg