summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-24 22:13:21 +0000
committerGerrit Code Review <review@openstack.org>2012-01-24 22:13:21 +0000
commitb328b0422035212c844ff5bbcc03f648fb7a2779 (patch)
treeb6065da814d9ab59937fb6d2d854f2b92228e2ca
parentb463f0a87a0db872232d26fba915b29712faf7cd (diff)
parent248aa0cdc3b324fab1f7da5dc665f7852b8aa7d2 (diff)
downloadnova-b328b0422035212c844ff5bbcc03f648fb7a2779.tar.gz
nova-b328b0422035212c844ff5bbcc03f648fb7a2779.tar.xz
nova-b328b0422035212c844ff5bbcc03f648fb7a2779.zip
Merge "Change the logic for deleting a record dns_domains."
-rw-r--r--nova/db/sqlalchemy/api.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 0c8637225..258d6e1f0 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -948,9 +948,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