Merge pull request #599 from rsyed83/exclude_managed_dns

Exclude Managed DNS from service registration to avoid conflict with Cloud DNS
pycontribs · Jan 14, 2016 · ed1adab · ed1adab
2 parents 617f761 + 646eac4
commit ed1adab
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pyrax/base_identity.py b/pyrax/base_identity.py
@@ -648,6 +648,10 @@ def _parse_service_catalog(self):
             if not hasattr(service, "endpoints"):
                 # Not an OpenStack service
                 continue
+            if service.prefix == '' and service.service_type == 'dns':
+                # Skip service registration of Managed DNS
+                # so it doesn't conflict with Cloud DNS
+                continue
             setattr(self.services, service.service_type, service)
             self.regions.update(list(service.endpoints.keys()))
         # Update the 'ALL' services to include all available regions.