Merge lp://qastaging/~hopem/charms/trusty/keystone/fix-ssl-inject into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Proposed by
Edward Hope-Morley
| Status: | Merged |
|---|---|
| Merged at revision: | 131 |
| Proposed branch: | lp://qastaging/~hopem/charms/trusty/keystone/fix-ssl-inject |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next |
| Diff against target: |
383 lines (+195/-18) 6 files modified
hooks/charmhelpers/contrib/openstack/context.py (+59/-1) hooks/charmhelpers/contrib/openstack/neutron.py (+70/-0) hooks/charmhelpers/core/hookenv.py (+26/-0) hooks/charmhelpers/core/host.py (+5/-1) hooks/keystone_context.py (+29/-15) unit_tests/test_keystone_contexts.py (+6/-1) |
| To merge this branch: | bzr merge lp://qastaging/~hopem/charms/trusty/keystone/fix-ssl-inject |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Billy Olsen | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM. Deployments work fine with ssl inject for ha and non-ha.