Merge lp:~hopem/charms/precise/keystone/stable-fix-legacy-import-error into lp:~openstack-charmers-archive/charms/precise/keystone/trunk

[Edward Hope-Morley]

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/keystone_utils.py'
--- hooks/keystone_utils.py	2015-02-06 12:29:53 +0000
+++ hooks/keystone_utils.py	2015-02-19 14:41:16 +0000
@@ -560,7 +560,12 @@
     # Allow retry on fail since leader may not be ready yet.
     # NOTE(hopem): ks client may not be installed at module import time so we
     # use this wrapped approach instead.
-    from keystoneclient.apiclient.exceptions import InternalServerError
+    try:
+        from keystoneclient.apiclient.exceptions import InternalServerError
+    except:
+        # Backwards-compatibility for earlier versions of keystoneclient (< I)
+        from keystoneclient.exceptions import (ClientException as
+                                               InternalServerError)
 
     @retry_on_exception(3, base_delay=3, exc_type=InternalServerError)
     def _ensure_initial_admin(config):