Tolerate 404 on user delete.

Fixes bug: #1196707

Change-Id: I70f43f2f789b2c36983d0cecf41604e89268c09e

diff --git a/heat/engine/resources/user.py b/heat/engine/resources/user.py
index d09c9dd0b2f0da0227e03e63df1c89309816f16b..6e53ea77c46ebc7f6b51753cb6f01f5a90bc7fb5 100644 (file)
--- 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())