From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 21 Jun 2012 12:32:14 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.1-12~51
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=67288d32c856344f4084e93d97402d16c9a756f3;hp=bcfe3fa55dd1c6ba6929cc327043c3dfecf7fd18;p=sfa.git

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

diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py
index 19a91e89..493c7080 100644
--- 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: