lp:~openstack-charmers/charms/precise/swift-proxy/python-redux

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~charmers/charms/precise/swift-proxy/trunk at revision 45

charmers: Pending requested 2013-10-15

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

57. By Adam Gandelman on 2013-10-15

Update charm-helpers config to point to upstream repo, re-sync helpers.

56. By James Page on 2013-10-11

Resync with charmhelpers for new swift version

55. By James Page on 2013-09-27

Add preinstall execd hooks

54. By James Page on 2013-09-27

Deal with apache 2.4, write out rc monitoring script

53. By James Page on 2013-09-27

Redux

52. By James Page on 2013-09-26

Fixup is_apache24 check pre apache2 installation

51. By James Page on 2013-09-25

Update templates for havana, drop s3_token auth for the interim

50. By James Page on 2013-09-25

Hack apache helper to be 2.4 compat

49. By James Page on 2013-09-25

Add support for apache2.4

48. By James Page on 2013-09-25

Use upstream_version for apt version checks