From bd37a3bee6f8bd3996aa1e017adb01546df385a6 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Wed, 14 Aug 2013 11:15:38 +1200 Subject: [PATCH] Tolerate missing user on signal responder delete SignalResponder delete fails if the created user has already been deleted. This change catches the 404 as for the User resource. Change-Id: I55034469d10f2742296f0415fe26272d3683530d Closes-bug: #1211633 --- heat/engine/signal_responder.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/heat/engine/signal_responder.py b/heat/engine/signal_responder.py index 2bf08a18..e51222c6 100644 --- a/heat/engine/signal_responder.py +++ b/heat/engine/signal_responder.py @@ -21,6 +21,7 @@ from oslo.config import cfg from keystoneclient.contrib.ec2 import utils as ec2_utils from heat.common import exception +from heat.engine import clients from heat.engine import resource from heat.openstack.common import log @@ -51,7 +52,10 @@ class SignalResponder(resource.Resource): def handle_delete(self): if self.resource_id is None: return - self.keystone().delete_stack_user(self.resource_id) + try: + self.keystone().delete_stack_user(self.resource_id) + except clients.hkc.kc.exceptions.NotFound: + pass def _get_signed_url(self, signal_type=SIGNAL): """Create properly formatted and pre-signed URL. -- 2.45.2