lp:~james-page/charms/trusty/glance/network-splits

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/glance/next at revision 55

James Page: Needs Resubmitting on 2014-07-25

James Troup (community): Needs Fixing on 2014-07-24

OpenStack Charmers: Pending requested 2014-07-25

Diff: 1049 lines (+511/-168)

23 files modified

.bzrignore (+2/-0)
Makefile (+11/-5)
charm-helpers-hooks.yaml (+2/-1)
config.yaml (+28/-9)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+2/-2)
hooks/charmhelpers/contrib/network/ip.py (+156/-0)
hooks/charmhelpers/contrib/openstack/context.py (+28/-3)
hooks/charmhelpers/contrib/openstack/ip.py (+75/-0)
hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+15/-0)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+41/-0)
hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend (+23/-0)
hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf (+23/-0)
hooks/charmhelpers/core/host.py (+4/-0)
hooks/glance_contexts.py (+1/-0)
hooks/glance_relations.py (+62/-28)
hooks/glance_utils.py (+1/-1)
templates/haproxy.cfg (+0/-36)
tests/charmhelpers/contrib/amulet/deployment.py (+14/-19)
tests/charmhelpers/contrib/amulet/utils.py (+2/-2)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+3/-5)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+1/-45)
unit_tests/test_glance_relations.py (+14/-9)
unit_tests/test_utils.py (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

72. By James Page on 2014-07-25

Rebase

71. By James Page on 2014-07-24

Resync to trunk helpers

70. By James Page on 2014-07-16

Resync helpers, drop surplus vip config

69. By James Page on 2014-07-16

Use vip grp for cluster leadership

68. By James Page on 2014-07-15

Resync helpers, tidy lint

67. By James Page on 2014-07-04

Resync helpers for IPv6 support

66. By James Page on 2014-07-03

Add base IPv6 support

65. By James Page on 2014-07-03

Fixup ha cluster relation to be multi-vip aware

64. By James Page on 2014-07-03

Use new helper everywhere

63. By James Page on 2014-07-03

Use new helper for url resolution for endpoints