lp:~brad-marshall/charms/trusty/swift-storage/fix-nagios

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/swift-storage/next at revision 58

OpenStack Charmers: Pending requested 2015-02-24

Diff: 1245 lines (+860/-47)

21 files modified

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/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/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)
tests/basic_deployment.py (+1/-1)
tests/charmhelpers/contrib/amulet/utils.py (+122/-2)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+5/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

60. By Brad Marshall on 2015-02-20

[bradm] Handle case of empty nagios_servicegroups setting

59. By Brad Marshall on 2015-02-19

[bradm] Add nagios_servicegroups config option

58. By Brad Marshall on 2015-02-19

[bradm] Sync charmhelpers

57. By Corey Bryant on 2015-02-05

[coreycb,trivial] Switch Amulet tests to use stable branches

56. By Liam Young on 2015-01-26

[gnuoy,trivial] Pre-release charmhelper sync

55. By Liam Young on 2015-01-12

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

54. By Liam Young on 2015-01-09

[bradm, gnuoy,r=jamespage] This is an update of the branch ~brad-marshall wrote to add the generation of nrpe support to the charm.

53. By Edward Hope-Morley on 2014-12-18

[hopem,r=gnuoy]

Adds support for retrying ring fetch from broker.

As rings are updated on the broker, there will be
a small window where they are unavailable and wget
will return a 404. We will now retry a few times
before eventually failing.

52. By Corey Bryant on 2014-12-18

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

51. By James Page on 2014-12-15

[trivial] Resync charm-helpers