From 56538d7c765391a35669247bf3d9d035a4d9c728 Mon Sep 17 00:00:00 2001 From: Gage Hugo Date: Tue, 3 Sep 2019 13:15:28 -0500 Subject: [PATCH] Handle keystone cred cleanup hook fail In cases where mariadb is not accessable, either from being deleted prior to deleting keystone, or some other reason, it is preferred to fail and move on with the keystone-credential-cleanup. This change adds hook-failed to the "hook-delete-policy" for the keystone-credential-cleanup job. This is address cases where deleting keystone would cause the delete task to hang while the cleanup hook would fail to connect to mariadb, often due to mariadb being already deleted. Change-Id: Ice7187fe6329c8b12333f508351bd5f9e2cdc8e2 --- keystone/templates/job-credential-cleanup.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keystone/templates/job-credential-cleanup.yaml b/keystone/templates/job-credential-cleanup.yaml index 1470d4dc68..5337dcd50e 100644 --- a/keystone/templates/job-credential-cleanup.yaml +++ b/keystone/templates/job-credential-cleanup.yaml @@ -32,7 +32,7 @@ metadata: name: "keystone-credential-cleanup" annotations: "helm.sh/hook": pre-delete - "helm.sh/hook-delete-policy": hook-succeeded + "helm.sh/hook-delete-policy": hook-succeeded, hook-failed spec: template: metadata: