From 6c8fdd072379880dc04720d4caa0d961b5b9b1cb Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Tue, 2 Jul 2013 15:17:34 +1200
Subject: [PATCH] Tolerate 404 on user delete.

Fixes bug: #1196707

Change-Id: I70f43f2f789b2c36983d0cecf41604e89268c09e
---
 heat/engine/resources/user.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/heat/engine/resources/user.py b/heat/engine/resources/user.py
index d09c9dd0b2..6e53ea77c4 100644
--- a/heat/engine/resources/user.py
+++ b/heat/engine/resources/user.py
@@ -85,7 +85,10 @@ class User(resource.Resource):
         if self.resource_id is None:
             logger.error("Cannot delete User resource before user created!")
             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 FnGetRefId(self):
         return unicode(self.physical_resource_name())