Merge lp://qastaging/~gandelman-a/charm-helpers/image_service_ctxt into lp://qastaging/charm-helpers
Proposed by
Adam Gandelman
| Status: | Merged |
|---|---|
| Merged at revision: | 60 |
| Proposed branch: | lp://qastaging/~gandelman-a/charm-helpers/image_service_ctxt |
| Merge into: | lp://qastaging/charm-helpers |
| Diff against target: |
117 lines (+51/-9) 5 files modified
charmhelpers/contrib/openstack/context.py (+23/-0) charmhelpers/contrib/openstack/templates/ceph.conf (+2/-2) charmhelpers/contrib/openstack/templates/haproxy.cfg (+3/-3) charmhelpers/contrib/openstack/templates/openstack_https_frontend (+4/-4) tests/contrib/openstack/test_os_contexts.py (+19/-0) |
| To merge this branch: | bzr merge lp://qastaging/~gandelman-a/charm-helpers/image_service_ctxt |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Charm Helper Maintainers | Pending | ||
|
Review via email:
|
|||
Description of the change
Adds another OpenStack context generator for image-service relations, to be shared across nova and cinder charms. Also updated the templates to prevent unnecessary whitespace in rendered configs.
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
