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

Proposed by Edward Hope-Morley on 2015-02-19
Status: Merged
Merge reported by: Edward Hope-Morley
Merged at revision: not available
Proposed branch: lp:~hopem/charms/precise/keystone/stable-fix-legacy-import-error
Merge into: lp:~openstack-charmers-archive/charms/precise/keystone/trunk
Diff against target: 17 lines (+6/-1)
1 file modified
hooks/keystone_utils.py (+6/-1)
To merge this branch: bzr merge lp:~hopem/charms/precise/keystone/stable-fix-legacy-import-error
Reviewer Review Type Date Requested Status
Liam Young 2015-02-19 Approve on 2015-02-20
Review via email: mp+250317@code.launchpad.net
To post a comment you must log in.
Liam Young (gnuoy) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
560 # Allow retry on fail since leader may not be ready yet.560 # Allow retry on fail since leader may not be ready yet.
561 # NOTE(hopem): ks client may not be installed at module import time so we561 # NOTE(hopem): ks client may not be installed at module import time so we
562 # use this wrapped approach instead.562 # use this wrapped approach instead.
563 from keystoneclient.apiclient.exceptions import InternalServerError563 try:
564 from keystoneclient.apiclient.exceptions import InternalServerError
565 except:
566 # Backwards-compatibility for earlier versions of keystoneclient (< I)
567 from keystoneclient.exceptions import (ClientException as
568 InternalServerError)
564569
565 @retry_on_exception(3, base_delay=3, exc_type=InternalServerError)570 @retry_on_exception(3, base_delay=3, exc_type=InternalServerError)
566 def _ensure_initial_admin(config):571 def _ensure_initial_admin(config):

Subscribers

People subscribed via source and target branches