lp://qastaging/~james-page/charms/trusty/cinder/network-splits

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/~openstack-charmers-archive/charms/trusty/cinder/next at revision 40

Liam Young (community): Approve on 2014-07-28

Diff: 690 lines (+382/-42)

15 files modified

.bzrignore (+2/-0)
Makefile (+9/-5)
charm-helpers.yaml (+1/-0)
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/haproxy.cfg (+6/-1)
hooks/charmhelpers/core/host.py (+4/-0)
hooks/cinder_contexts.py (+1/-0)
hooks/cinder_hooks.py (+57/-16)
hooks/cinder_utils.py (+2/-2)
unit_tests/test_cinder_hooks.py (+1/-0)
unit_tests/test_cluster_hooks.py (+10/-4)

api

Superseded for merging into lp://qastaging/~openstack-charmers-archive/charms/trusty/cinder/trunk

OpenStack Charmers: Pending requested 2014-07-24

Diff: 1578 lines (+903/-108) (has conflicts)

25 files modified

.bzrignore (+2/-0)
Makefile (+9/-5)
charm-helpers.yaml (+1/-0)
config.yaml (+28/-9)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+3/-2)
hooks/charmhelpers/contrib/network/ip.py (+156/-0)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+55/-0)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+209/-0)
hooks/charmhelpers/contrib/openstack/context.py (+73/-16)
hooks/charmhelpers/contrib/openstack/ip.py (+75/-0)
hooks/charmhelpers/contrib/openstack/neutron.py (+14/-0)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+6/-1)
hooks/charmhelpers/contrib/openstack/templating.py (+22/-23)
hooks/charmhelpers/contrib/openstack/utils.py (+11/-3)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+1/-1)
hooks/charmhelpers/contrib/storage/linux/utils.py (+1/-0)
hooks/charmhelpers/core/fstab.py (+116/-0)
hooks/charmhelpers/core/hookenv.py (+5/-4)
hooks/charmhelpers/core/host.py (+12/-6)
hooks/charmhelpers/fetch/__init__.py (+33/-16)
hooks/cinder_contexts.py (+1/-0)
hooks/cinder_hooks.py (+57/-16)
hooks/cinder_utils.py (+2/-2)
unit_tests/test_cinder_hooks.py (+1/-0)
unit_tests/test_cluster_hooks.py (+10/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

65. By James Page on 2014-07-25

Rebase

64. By James Page on 2014-07-24

Resync to trunk helpers

63. By James Page on 2014-07-16

Resync helpers, drop surplus vip config

62. By James Page on 2014-07-15

Tidy lint

61. By James Page on 2014-07-04

Resync helpers

60. By James Page on 2014-07-04

Use vip group to determine cluster leadership

59. By James Page on 2014-07-03

Only use [] formatting for URL's

58. By James Page on 2014-07-03

Resync helpers

57. By James Page on 2014-07-03

Resync helper

56. By James Page on 2014-07-03

Fixup handling