lp://staging/~brad-marshall/charms/trusty/openstack-dashboard/add-haproxy-nrpe-fix-servicegroups

Branch merges

Propose for merging

No branches dependent on this one.

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

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

Diff: 1234 lines (+856/-44)

24 files modified

charm-helpers.yaml (+1/-1)
config.yaml (+6/-1)
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/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/ceph.conf (+15/-0)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+58/-0)
hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend (+24/-0)
hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf (+24/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+1/-0)
hooks/charmhelpers/contrib/python/packages.py (+2/-2)
hooks/charmhelpers/core/fstab.py (+4/-4)
hooks/charmhelpers/core/host.py (+5/-5)
hooks/charmhelpers/core/strutils.py (+42/-0)
hooks/charmhelpers/core/sysctl.py (+13/-7)
hooks/charmhelpers/core/templating.py (+3/-3)
hooks/charmhelpers/core/unitdata.py (+477/-0)
hooks/charmhelpers/fetch/archiveurl.py (+10/-10)
hooks/charmhelpers/fetch/giturl.py (+1/-1)
hooks/horizon_hooks.py (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

55. By Brad Marshall on 2015-02-24

[bradm] Fixed to include all files

54. By Brad Marshall on 2015-02-20

[bradm] Handle case of empty nagios_servicegroups setting

53. By Brad Marshall on 2015-02-19

[bradm] Add nagios_servicegroups config option

52. By Brad Marshall on 2015-02-19

[bradm] Add haproxy nrpe checks

51. By Brad Marshall on 2015-02-19

[bradm] Sync charmhelpers

50. By Liam Young on 2015-01-26

[gnuoy,trivial] Pre-release charmhelper sync

49. By James Page on 2015-01-13

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

48. By Liam Young on 2015-01-12

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

47. By Edward Hope-Morley on 2015-01-08

[xtrusia,r=hopem]

Add execd_preinstall() to install hook

Closes-Bug: 1384728

46. By Corey Bryant on 2014-12-18

[hopem,r=corey.bryant] Retry crm resource check if not running.