lp://qastaging/~brad-marshall/charms/trusty/glance/add-haproxy-nrpe-fix-servicegroups

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/~openstack-charmers-archive/charms/trusty/glance/next at revision 99

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

Diff: 1260 lines (+862/-47)

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

api

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

OpenStack Charmers: Pending requested 2015-02-19

Diff: 1101 lines (+738/-43)

20 files modified

config.yaml (+6/-0)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+40/-6)
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)
hooks/glance_relations.py (+2/-0)
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

102. By Brad Marshall on 2015-02-20

[bradm] Handle case of empty nagios_servicegroups setting

101. By Brad Marshall on 2015-02-19

[bradm] Fixed formatting of config.yaml

100. By Brad Marshall on 2015-02-19

[bradm] Add nagios_servicegroups config option

99. By Brad Marshall on 2015-02-19

[bradm] Add haproxy nrpe checks

98. By Brad Marshall on 2015-02-19

[bradm] Sync charmhelpers

97. By Corey Bryant on 2015-02-05

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

96. By Liam Young on 2015-01-26

[gnuoy,trivial] Pre-release charmhelper sync

95. By Liam Young on 2015-01-23

[gnuoy,r=james-page] Update default multicast port to avoid smoosh clash

94. By James Page on 2015-01-13

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

93. By James Page on 2015-01-13

[trivial] Resync helpers