lp:~brad-marshall/charms/trusty/neutron-api/add-haproxy-nrpe-fix-servicegroups

Branch merges

Propose for merging

No branches dependent on this one.

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

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

Diff: 1455 lines (+264/-499)

16 files modified

Makefile (+1/-1)
config.yaml (+6/-0)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+41/-7)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+5/-1)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+5/-2)
hooks/charmhelpers/contrib/openstack/context.py (+28/-9)
hooks/charmhelpers/contrib/openstack/files/__init__.py (+18/-0)
hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+32/-0)
hooks/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh (+30/-0)
hooks/charmhelpers/contrib/openstack/ip.py (+37/-0)
hooks/charmhelpers/contrib/openstack/templates/zeromq (+14/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+1/-0)
hooks/charmhelpers/core/fstab.py (+2/-2)
hooks/charmhelpers/core/strutils.py (+42/-0)
hooks/charmhelpers/core/unitdata.py (+0/-477)
hooks/neutron_api_hooks.py (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

81. By Brad Marshall on 2015-02-26

[bradm] Fixed merge conflicts

80. By Edward Hope-Morley on 2015-02-24

[trivial] charmhelpers sync

79. By Corey Bryant on 2015-02-19

[gnuoy,r=1chb1n,r=corey.bryant] Add basic Amulet tests

78. By Corey Bryant on 2015-02-16

[gnuoy,r=corey.bryant] Explicitly install python-six to get cloud archive version installed

77. By Liam Young on 2015-02-13

Fix lint and unit tests after previous commit

76. By Liam Young on 2015-02-13

[jasper-aikema, r=gnuoy] Fix postgres relation

75. By Liam Young on 2015-02-12

[jamespage,r=gnuoy] Add kilo support to charm

74. By Edward Hope-Morley on 2015-02-11

[trivial] synced charm-helpers

73. By Liam Young on 2015-01-26

[gnuoy,trivial] Pre-release charmhelper sync

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