From 5f5f22f9b00dae1a2c649301bcdc463e12a22016 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Tue, 3 Jul 2012 12:32:02 +0200 Subject: [PATCH] Delete user creds from DB when no longer required The user credentials are only for a particular stack and should be deleted when that stack is deleted. Fixes #162. Change-Id: Id5d1f101df17ede1843e4f2fca51903c956667ca Signed-off-by: Zane Bitter --- heat/db/sqlalchemy/api.py | 2 ++ heat/db/sqlalchemy/models.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/heat/db/sqlalchemy/api.py b/heat/db/sqlalchemy/api.py index f68560ccc4..dd800fe5be 100644 --- a/heat/db/sqlalchemy/api.py +++ b/heat/db/sqlalchemy/api.py @@ -166,9 +166,11 @@ def stack_delete(context, stack_id): session.delete(r) rt = s.raw_template + uc = s.user_creds session.delete(s) session.delete(rt) + session.delete(uc) session.flush() diff --git a/heat/db/sqlalchemy/models.py b/heat/db/sqlalchemy/models.py index 337ca728b5..25f63b0891 100644 --- a/heat/db/sqlalchemy/models.py +++ b/heat/db/sqlalchemy/models.py @@ -172,6 +172,8 @@ class UserCreds(BASE, HeatBase): aws_auth_url = Column(String) tenant_id = Column(String) aws_creds = Column(String) + stack = relationship(Stack, + backref=backref('user_creds')) class Event(BASE, HeatBase):