Merge lp://staging/~openstack-charmers/charms/precise/swift-proxy/python-redux into lp://staging/~charmers/charms/precise/swift-proxy/trunk
Proposed by
Adam Gandelman
| Status: | Merged |
|---|---|
| Merged at revision: | 45 |
| Proposed branch: | lp://staging/~openstack-charmers/charms/precise/swift-proxy/python-redux |
| Merge into: | lp://staging/~charmers/charms/precise/swift-proxy/trunk |
| Diff against target: |
4996 lines (+3213/-1404) 33 files modified
Makefile (+14/-0) charm-helpers.yaml (+10/-0) hooks/charmhelpers/contrib/hahelpers/apache.py (+58/-0) hooks/charmhelpers/contrib/hahelpers/cluster.py (+183/-0) hooks/charmhelpers/contrib/openstack/context.py (+522/-0) hooks/charmhelpers/contrib/openstack/neutron.py (+117/-0) hooks/charmhelpers/contrib/openstack/templates/__init__.py (+2/-0) hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+11/-0) hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+37/-0) hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend (+23/-0) hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf (+23/-0) hooks/charmhelpers/contrib/openstack/templating.py (+280/-0) hooks/charmhelpers/contrib/openstack/utils.py (+365/-0) hooks/charmhelpers/core/hookenv.py (+340/-0) hooks/charmhelpers/core/host.py (+241/-0) hooks/charmhelpers/fetch/__init__.py (+209/-0) hooks/charmhelpers/fetch/archiveurl.py (+48/-0) hooks/charmhelpers/fetch/bzrurl.py (+49/-0) hooks/charmhelpers/payload/__init__.py (+1/-0) hooks/charmhelpers/payload/execd.py (+50/-0) hooks/lib/apache_utils.py (+0/-193) hooks/lib/cluster_utils.py (+0/-130) hooks/lib/haproxy_utils.py (+0/-52) hooks/lib/openstack_common.py (+0/-231) hooks/lib/utils.py (+0/-332) hooks/swift_context.py (+223/-0) hooks/swift_hooks.py (+208/-164) hooks/swift_utils.py (+133/-246) revision (+1/-1) templates/apache2_site.tmpl (+0/-19) templates/grizzly/proxy-server.conf (+0/-1) templates/haproxy.cfg (+0/-35) templates/havana/proxy-server.conf (+65/-0) |
| To merge this branch: | bzr merge lp://staging/~openstack-charmers/charms/precise/swift-proxy/python-redux |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
Update of all Havana / Saucy / python-redux work:
* Full python rewrite using new OpenStack charm-helpers.
* Test coverage
* Havana support
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
