From 4867bd965891e5e58877422211420815428295ca Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Fri, 7 Dec 2012 17:40:26 +0100 Subject: [PATCH] Don't get nested stacks by name Don't return nested stacks from stack_get_by_name(). This prevented the user creating a stack with the same name as a nested stack, and was a temporary workaround for the metadata server (see be3c066ab87cc6e1a2ca8c097eeccd9217d7329a) bug 1072954 Change-Id: I1e3d0289476377f5b4169835119052f4fa573f86 Signed-off-by: Zane Bitter --- heat/db/sqlalchemy/api.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/heat/db/sqlalchemy/api.py b/heat/db/sqlalchemy/api.py index d52f0a43..9cb14de3 100644 --- a/heat/db/sqlalchemy/api.py +++ b/heat/db/sqlalchemy/api.py @@ -114,10 +114,9 @@ def resource_get_all_by_stack(context, stack_id): def stack_get_by_name(context, stack_name, owner_id=None): query = model_query(context, models.Stack).\ filter_by(tenant=context.tenant_id).\ - filter_by(name=stack_name) + filter_by(name=stack_name).\ + filter_by(owner_id=owner_id) - if owner_id: - query = query.filter_by(owner_id=owner_id) return query.first() -- 2.45.2