Merge branch 'master' of ssh://git.onelab.eu/git/sfa

diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py
index 19a91e8..493c708 100644 (file)
--- a/sfa/openstack/osaggregate.py
+++ b/sfa/openstack/osaggregate.py
@@ -83,7 +83,13 @@ class OSAggregate:
         return rspec.toxml()
 
     def get_availability_zones(self):
-        zones = self.driver.shell.db.zone_get_all()
+        try:
+            # pre essex releases 
+            zones = self.driver.shell.db.zone_get_all()
+        except:
+            # essex release
+            zones = self.driver.shell.db.dnsdomain_list()
+
         if not zones:
             zones = ['cloud']
         else: