From 77f56b70e3b84de13bf848e2f3fdc33809fc3936 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Tue, 10 May 2022 18:51:11 +0200 Subject: [PATCH] M #-: Set provision to DELETING (#2029) (cherry picked from commit 7fa6ad468db9c53eda86dc1ba95df5b700dfd8ed) --- src/oneprovision/lib/provision/provision.rb | 27 +++++++++------------ 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/oneprovision/lib/provision/provision.rb b/src/oneprovision/lib/provision/provision.rb index 01365ba66f..32fadb3f0c 100644 --- a/src/oneprovision/lib/provision/provision.rb +++ b/src/oneprovision/lib/provision/provision.rb @@ -585,26 +585,23 @@ module OneProvision def delete(cleanup, timeout, force = false) exist = true - unless force - if running_vms? && !cleanup - Utils.fail('Provision with running VMs can\'t be deleted') - end + if !force && !cleanup && running_vms? + Utils.fail('Provision with running VMs can\'t be deleted') + end - if images? && !cleanup - Utils.fail('Provision with images can\'t be deleted') - end - - self.state = STATE['DELETING'] - - update - - delete_vms(timeout) if cleanup - - delete_images(timeout) if cleanup + if !force && !cleanup && images? + Utils.fail('Provision with images can\'t be deleted') end self.state = STATE['DELETING'] + update + + if !force && cleanup + delete_vms(timeout) + delete_images(timeout) + end + OneProvisionLogger.info("Deleting provision #{self['ID']}") if hosts && !hosts.empty? && tf_state && tf_conf