lp://staging/~gnuoy/charms/trusty/heat/add-nrpe-checks

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~openstack-charmers-archive/charms/trusty/heat/trunk at revision 28

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

Diff: 4992 lines (+2420/-601)

41 files modified

Makefile (+2/-2)
charm-helpers.yaml (+2/-0)
config.yaml (+10/-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/apache.py (+10/-3)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+41/-19)
hooks/charmhelpers/contrib/network/ip.py (+212/-35)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+40/-9)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+8/-5)
hooks/charmhelpers/contrib/openstack/context.py (+469/-225)
hooks/charmhelpers/contrib/openstack/ip.py (+41/-27)
hooks/charmhelpers/contrib/openstack/neutron.py (+26/-4)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+27/-12)
hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend (+9/-8)
hooks/charmhelpers/contrib/openstack/templates/openstack_https_frontend.conf (+9/-8)
hooks/charmhelpers/contrib/openstack/templating.py (+5/-5)
hooks/charmhelpers/contrib/openstack/utils.py (+179/-12)
hooks/charmhelpers/contrib/python/packages.py (+77/-0)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+132/-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 (+83/-31)
hooks/charmhelpers/core/host.py (+90/-31)
hooks/charmhelpers/core/services/__init__.py (+2/-2)
hooks/charmhelpers/core/services/base.py (+3/-0)
hooks/charmhelpers/core/services/helpers.py (+124/-6)
hooks/charmhelpers/core/sysctl.py (+34/-0)
hooks/charmhelpers/core/templating.py (+3/-2)
hooks/charmhelpers/fetch/__init__.py (+45/-18)
hooks/charmhelpers/fetch/archiveurl.py (+99/-17)
hooks/charmhelpers/fetch/bzrurl.py (+5/-1)
hooks/charmhelpers/fetch/giturl.py (+51/-0)
hooks/heat_relations.py (+19/-2)
hooks/heat_utils.py (+9/-0)
metadata.yaml (+4/-0)
unit_tests/test_heat_relations.py (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

37. By Liam Young on 2015-01-12

Add decorators.py after charmhelpers sync

36. By Liam Young on 2015-01-12

Use rnpe functions from charmhelpers

35. By Liam Young on 2015-01-09

Fixed unit_tests

34. By Liam Young on 2015-01-09

Merged 'next'

33. By Brad Marshall on 2014-11-18

[bradm] Removed nagios check files as they're now in n-e-m charm, added support for sysvinit daemon monitoring.

32. By Brad Marshall on 2014-11-17

[bradm] Fixes from pep8, used services() rather than hard coded list

31. By Brad Marshall on 2014-11-06

[bradm] Check if host_context is defined before using it, checking if files before installing

30. By Brad Marshall on 2014-11-04

[bradm] Tweaked check to include host context and unit name

29. By Brad Marshall on 2014-10-31

[bradm] Added support to get nagios hostname from nrpe relation

28. By Brad Marshall on 2014-10-30

[bradm] Added charmsupport to charmhelpers