Fix resource-data delete bug.

Bug 1201974.

Change-Id: I6c4692df71dc7188c0a9caf0ca6c26b67b4e168f

diff --git a/heat/db/sqlalchemy/models.py b/heat/db/sqlalchemy/models.py
index 6ee060fb95c0882d6d2ada4673727f7dad89680f..2928b9147c8c3f8e4fce93787644ad8ce9df7bea 100644 (file)
--- a/heat/db/sqlalchemy/models.py
+++ b/heat/db/sqlalchemy/models.py
@@ -252,8 +252,9 @@ class Resource(BASE, HeatBase):
                                  sqlalchemy.ForeignKey('stack.id'),
                                  nullable=False)
     stack = relationship(Stack, backref=backref('resources'))
-    data = relationship(ResourceData, backref=backref('resources',
-                                                      lazy='joined'))
+    data = relationship(ResourceData,
+                        cascade="all,delete",
+                        backref=backref('resource', lazy='joined'))
 
 
 class WatchRule(BASE, HeatBase):