Merge lp:~openstack-charmers/charms/precise/cinder/ssl-everywhere into lp:~openstack-charmers-archive/charms/precise/cinder/trunk
Proposed by
Kapil Thangavelu
Status: | Merged |
---|---|
Merged at revision: | 33 |
Proposed branch: | lp:~openstack-charmers/charms/precise/cinder/ssl-everywhere |
Merge into: | lp:~openstack-charmers-archive/charms/precise/cinder/trunk |
Diff against target: |
391 lines (+130/-41) 9 files modified
charm-helpers.yaml (+1/-1) config.yaml (+5/-0) hooks/charmhelpers/contrib/hahelpers/apache.py (+9/-8) hooks/charmhelpers/contrib/openstack/context.py (+88/-23) hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+3/-0) hooks/charmhelpers/contrib/storage/linux/ceph.py (+6/-2) hooks/cinder_utils.py (+5/-4) templates/cinder.conf (+10/-3) templates/havana/api-paste.ini (+3/-0) |
To merge this branch: | bzr merge lp:~openstack-charmers/charms/precise/cinder/ssl-everywhere |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Ceppi | Pending | ||
Edward Hope-Morley | Pending | ||
Review via email: mp+209300@code.launchpad.net |
Description of the change
SSL client support for mysql and rabbitmq
Sync of charm helpers and config template changes
To post a comment you must log in.