summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-04-04 15:24:18 +0000
committerGerrit Code Review <review@openstack.org>2018-04-04 15:24:18 +0000
commitcb60d7316c283667629355f33bf5602c4950101f (patch)
tree6cf93b8a969b120185e56239c036b33aaea6c5c8
parent80f6b557bdea71526b8e212220ba15e5b6964918 (diff)
parentfd5c3ccb6df50e4ab910da43b76b3424dac97d97 (diff)
downloaddesignate-cb60d7316c283667629355f33bf5602c4950101f.tar.gz
Merge "Resolve get_dns_view error after selecting multi-tenant view" into stable/queensqueens-em6.0.1
-rw-r--r--designate/backend/impl_infoblox/object_manipulator.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/designate/backend/impl_infoblox/object_manipulator.py b/designate/backend/impl_infoblox/object_manipulator.py
index d6e4a283..e6aa8c9c 100644
--- a/designate/backend/impl_infoblox/object_manipulator.py
+++ b/designate/backend/impl_infoblox/object_manipulator.py
@@ -96,7 +96,8 @@ class InfobloxObjectManipulator(object):
return dns_view
def get_dns_view(self, tenant):
- if not self.connector.multi_tenant:
+ if (not self.connector.multi_tenant or
+ self.connector.multi_tenant == '0'):
return self.connector.dns_view
else:
# Look for the network view with the specified TenantID EA