Merge lp:~hopem/charms/trusty/keystone/fix-legacy-import-error into lp:~openstack-charmers-archive/charms/trusty/keystone/next

[Edward Hope-Morley]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2115 keystone-next for hopem mp250315
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2115/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #1905 keystone-next for hopem mp250315
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1905/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2024 keystone-next for hopem mp250315
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/2024/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2117 keystone-next for hopem mp250315
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2117/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #1907 keystone-next for hopem mp250315
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1907/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2026 keystone-next for hopem mp250315
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/2026/

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/keystone_utils.py'
--- hooks/keystone_utils.py	2015-02-16 23:56:01 +0000
+++ hooks/keystone_utils.py	2015-02-19 14:40:55 +0000
@@ -582,7 +582,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):