From: Pawel Wieczorek <p.wieczorek2@samsung.com>
Date: Mon, 27 Jan 2020 16:32:20 +0000 (+0100)
Subject: Make cluster removal fail softly
X-Git-Tag: 6.0.0-ONAP~213
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=33649808cab93a4f60474b9381d67e5ac0559858;p=integration.git

Make cluster removal fail softly

VM destruction ("vagrant destroy") failed in case RKE cluster had not
been set up properly.

Initial intention for this trigger was to leave Control and Worker VMs
provisioned even if Operator VM is destroyed.

Issue-ID: ONAPARC-551
Change-Id: I2b47c539e2517a7c72675924731a0186d1ae25c0
Signed-off-by: Pawel Wieczorek <p.wieczorek2@samsung.com>
---

diff --git a/bootstrap/vagrant-minimal-onap/Vagrantfile b/bootstrap/vagrant-minimal-onap/Vagrantfile
index e3b2c950d..3ffa6a368 100644
--- a/bootstrap/vagrant-minimal-onap/Vagrantfile
+++ b/bootstrap/vagrant-minimal-onap/Vagrantfile
@@ -149,7 +149,7 @@ $link_file = <<-SCRIPT
 SCRIPT
 
 $rke_up = "rke up"
-$rke_down = "rke remove --force"
+$rke_down = "rke remove --force || true" # best effort
 
 $get_oom = <<-SCRIPT
   BRANCH="${1:-5.0.1-ONAP}"