From f45da069e43ce56e4c6d8ace685c1b191f7f4311 Mon Sep 17 00:00:00 2001
From: Dae Seong Kim <powerds0111@gmail.com>
Date: Fri, 4 Aug 2017 15:27:36 +0900
Subject: [PATCH] fix to avoid crash loop on glance clean job

glance clean job tries to delete a image. but if there's no the image,
the job falls in CrashLoopBackOff status when helm delete.

Change-Id: I3b9c3057b9da8780ca27f1cb18dcd5541f3bcabc
Closes-bug: 1708581
---
 glance/templates/bin/_clean.sh.tpl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/glance/templates/bin/_clean.sh.tpl b/glance/templates/bin/_clean.sh.tpl
index 11f7186e2e..b3a5d669e5 100644
--- a/glance/templates/bin/_clean.sh.tpl
+++ b/glance/templates/bin/_clean.sh.tpl
@@ -18,11 +18,10 @@ set -ex
 {{ if .Values.bootstrap.enabled }}
 {{ range .Values.bootstrap.images }}
   {{ if .id -}}
-    echo "Delete Glance Bootstrap Image..."
-    openstack image delete {{ .id }}
+    openstack image show {{ .id | quote }} && \
+      openstack image delete {{ .id | quote }}
   {{ end -}}
 {{ end }}
 
 {{ end }}
 exit 0
-