Resync to master charm-helpers

2014-04-02 18:04:22 +01:00 · 2014-04-02 18:04:22 +01:00 · e2c651f98c
commit e2c651f98c
parent 73cd8945d4
2 changed files with 4 additions and 1 deletions
--- a/charm-helpers.yaml
+++ b/charm-helpers.yaml
@ -1,4 +1,4 @@
-branch: lp:~openstack-charmers/charm-helpers/icehouse
+branch: lp:charm-helpers
 destination: hooks/charmhelpers
 include:
    - core
--- a/hooks/charmhelpers/contrib/openstack/context.py
+++ b/hooks/charmhelpers/contrib/openstack/context.py
@ -234,6 +234,9 @@ class IdentityServiceContext(OSContextGenerator):
                    rdata.get('auth_protocol') or 'http',
                }
                if context_complete(ctxt):
+                    # NOTE(jamespage) this is required for >= icehouse
+                    # so a missing value just indicates keystone needs
+                    # upgrading
                    ctxt['admin_tenant_id'] = rdata.get('service_tenant_id')
                    return ctxt
        return {}