Sfoglia il codice sorgente

Merge pull request #219 from nuwang/fix_service_zones

Fix incorrect networking zone name property in OS
Nuwan Goonasekera 6 anni fa
parent
commit
200e30940a
1 ha cambiato i file con 4 aggiunte e 5 eliminazioni
  1. 4 5
      cloudbridge/providers/openstack/services.py

+ 4 - 5
cloudbridge/providers/openstack/services.py

@@ -1003,6 +1003,10 @@ class OpenStackNetworkingService(BaseNetworkingService):
 
     def __init__(self, provider):
         super(OpenStackNetworkingService, self).__init__(provider)
+        # pylint:disable=protected-access
+        self.service_zone_name = self.provider._get_config_value(
+            'os_networking_zone_name', cb_helpers.get_env(
+                'OS_NETWORKING_ZONE_NAME', self.provider.zone_name))
         self._network_service = OpenStackNetworkService(self.provider)
         self._subnet_service = OpenStackSubnetService(self.provider)
         self._router_service = OpenStackRouterService(self.provider)
@@ -1035,11 +1039,6 @@ class OpenStackNetworkService(BaseNetworkService):
     def __init__(self, provider):
         super(OpenStackNetworkService, self).__init__(provider)
 
-        # pylint:disable=protected-access
-        self.service_zone_name = self.provider._get_config_value(
-            'os_networking_zone_name', cb_helpers.get_env(
-                'OS_NETWORKING_ZONE_NAME', self.provider.zone_name))
-
     @dispatch(event="provider.networking.networks.get",
               priority=BaseNetworkService.STANDARD_EVENT_PRIORITY)
     def get(self, network_id):