From: Anil Belur <abelur@linuxfoundation.org>
Date: Wed, 10 Jul 2019 00:12:22 +0000 (+0000)
Subject: Merge "Handle stack removal with the force option"
X-Git-Tag: v0.40.0~21
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=0278e1dec03cb9edbac39beef86cfca3d96a5b52;hp=59ef2e78b9af7977117c06f154ed5faf92adff6f;p=releng%2Fglobal-jjb.git

Merge "Handle stack removal with the force option"
---

diff --git a/releasenotes/notes/openstack-stack-del-with-force-b50cadbacc49d516.yaml b/releasenotes/notes/openstack-stack-del-with-force-b50cadbacc49d516.yaml
new file mode 100644
index 00000000..31a973b1
--- /dev/null
+++ b/releasenotes/notes/openstack-stack-del-with-force-b50cadbacc49d516.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Delete stacks with the ``--force`` option to ensure that any delete
+    failures does not stop the openstack-cron jobs from continuing.
diff --git a/shell/openstack-cleanup-orphaned-stacks.sh b/shell/openstack-cleanup-orphaned-stacks.sh
index 8140adea..ccc29969 100644
--- a/shell/openstack-cleanup-orphaned-stacks.sh
+++ b/shell/openstack-cleanup-orphaned-stacks.sh
@@ -87,6 +87,6 @@ for STACK_NAME in "${OS_STACKS[@]}"; do
         continue
     else
         echo "Deleting orphaned stack: $STACK_NAME"
-        lftools openstack --os-cloud "$os_cloud" stack delete "$STACK_NAME"
+        lftools openstack --os-cloud "$os_cloud" stack delete --force "$STACK_NAME"
     fi
 done