From 248aa0cdc3b324fab1f7da5dc665f7852b8aa7d2 Mon Sep 17 00:00:00 2001 From: Andrew Bogott Date: Sat, 21 Jan 2012 01:05:22 +0000 Subject: Change the logic for deleting a record dns_domains. Since keys are just the domain name, we need to be able to reuse them. That means we have to do a real record deletion to free up namespace rather than just mark the records as deleted. For blueprint public-and-private-dns. Change-Id: If47e961cf2cb977d297b506bd397f1a438499f18 --- nova/db/sqlalchemy/api.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index b81de6d61..c2704250e 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -748,9 +748,9 @@ def dnsdomain_register_for_project(context, fqdomain, project): def dnsdomain_unregister(context, fqdomain): session = get_session() with session.begin(): - domain_ref = _dnsdomain_get(context, session, fqdomain) - if domain_ref: - domain_ref.delete(session=session) + session.query(models.DNSDomain).\ + filter_by(domain=fqdomain).\ + delete() @require_context -- cgit