lp://qastaging/~james-page/charms/trusty/neutron-api/kilo-support

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next at revision 75

Liam Young (community): Approve on 2015-02-12

OpenStack Charmers: Pending requested 2015-02-02

Diff: 190 lines (+103/-7)

4 files modified

hooks/neutron_api_hooks.py (+4/-2)
hooks/neutron_api_utils.py (+10/-2)
templates/kilo/neutron.conf (+77/-0)
unit_tests/test_neutron_api_utils.py (+12/-3)

api

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

charmers: Pending requested 2015-01-21

Diff: 4555 lines (+1904/-567)

39 files modified

charm-helpers-sync.yaml (+2/-0)
config.yaml (+22/-0)
hooks/charmhelpers/__init__.py (+22/-0)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+308/-0)
hooks/charmhelpers/contrib/charmsupport/volumes.py (+159/-0)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+40/-17)
hooks/charmhelpers/contrib/network/ip.py (+52/-50)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+2/-1)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+3/-1)
hooks/charmhelpers/contrib/openstack/context.py (+347/-233)
hooks/charmhelpers/contrib/openstack/ip.py (+41/-27)
hooks/charmhelpers/contrib/openstack/neutron.py (+26/-4)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+7/-3)
hooks/charmhelpers/contrib/openstack/templating.py (+5/-5)
hooks/charmhelpers/contrib/openstack/utils.py (+152/-13)
hooks/charmhelpers/contrib/python/packages.py (+77/-0)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+143/-102)
hooks/charmhelpers/contrib/storage/linux/loopback.py (+4/-4)
hooks/charmhelpers/contrib/storage/linux/lvm.py (+1/-0)
hooks/charmhelpers/contrib/storage/linux/utils.py (+3/-2)
hooks/charmhelpers/core/decorators.py (+41/-0)
hooks/charmhelpers/core/fstab.py (+10/-8)
hooks/charmhelpers/core/hookenv.py (+41/-15)
hooks/charmhelpers/core/host.py (+60/-26)
hooks/charmhelpers/core/services/__init__.py (+2/-2)
hooks/charmhelpers/core/services/helpers.py (+9/-5)
hooks/charmhelpers/core/templating.py (+3/-2)
hooks/charmhelpers/fetch/__init__.py (+26/-13)
hooks/charmhelpers/fetch/archiveurl.py (+53/-16)
hooks/charmhelpers/fetch/bzrurl.py (+5/-1)
hooks/charmhelpers/fetch/giturl.py (+51/-0)
hooks/neutron_api_context.py (+7/-3)
hooks/neutron_api_hooks.py (+26/-4)
hooks/neutron_api_utils.py (+19/-3)
metadata.yaml (+3/-0)
templates/kilo/neutron.conf (+77/-0)
unit_tests/test_neutron_api_context.py (+1/-0)
unit_tests/test_neutron_api_hooks.py (+33/-0)
unit_tests/test_neutron_api_utils.py (+21/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

77. By James Page on 2015-02-24

Rebase

76. By James Page on 2015-02-24

Rebase on parent

75. By James Page on 2015-02-03

tidy lint

74. By James Page on 2015-02-02

Rebase

73. By James Page on 2015-01-20

Add kilo support

72. By James Page on 2015-01-13

[james-page,r=gnuoy] Add fallback configuration options for vip cidr and iface for non-standard deployments

71. By James Page on 2015-01-13

[trivial] Resync helpers

70. By Liam Young on 2015-01-12

[gnuoy,r=james-page] Add support for nrpe

69. By Edward Hope-Morley on 2015-01-12

[hopem,r=gnuoy]

Sync charm-helpers to get apache ssl port fix

68. By Liam Young on 2015-01-08

[gnuoy, r=jamespage] Enable haproxy for when there is a single unit in a deployment