diff options
| author | Zuul <zuul@review.openstack.org> | 2019-01-17 23:32:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-01-17 23:32:59 +0000 |
| commit | 67a81e4e963aef393fda485b6ab730ccd84b92d4 (patch) | |
| tree | 3744f35d88e8c25e99b7a3a49c80666bd10547b8 | |
| parent | f97df023b2dd3471fe0f715d02f1dbf910da1170 (diff) | |
| parent | 9a20caa33682bafdb71398665974e7fa32dfb75d (diff) | |
| download | designate-67a81e4e963aef393fda485b6ab730ccd84b92d4.tar.gz | |
Merge "Fix the child search logic during zone deletion."
| -rw-r--r-- | designate/central/service.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/designate/central/service.py b/designate/central/service.py index 3407a1c0..ec249018 100644 --- a/designate/central/service.py +++ b/designate/central/service.py @@ -1094,7 +1094,9 @@ class Service(service.RPCService, service.Service): # Prevent deletion of a zone which has child zones criterion = {'parent_zone_id': zone_id} - if self.storage.count_zones(context, criterion) > 0: + # Look for child zones across all tenants with elevated context + if self.storage.count_zones(context.elevated(all_tenants=True), + criterion) > 0: raise exceptions.ZoneHasSubZone('Please delete any subzones ' 'before deleting this zone') |