lp:~brad-marshall/charms/trusty/nova-cloud-controller/add-haproxy-nrpe-fix-servicegroups

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next at revision 142

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

Diff: 1247 lines (+861/-47)

21 files modified

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/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/nova_cc_hooks.py (+2/-0)
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

144. By Brad Marshall on 2015-02-20

[bradm] Handle case of empty nagios_servicegroups setting

143. By Brad Marshall on 2015-02-19

[bradm] Add nagios_servicegroups config option

142. By Brad Marshall on 2015-02-19

[bradm] Add haproxy nrpe checks

141. By Brad Marshall on 2015-02-19

[bradm] Sync charmhelpers

140. By Liam Young on 2015-01-26

[gnuoy,trivial] Pre-release charmhelper sync

139. By Edward Hope-Morley on 2015-01-22

[hopem,r=gnuoy]

Ensure that multiple vips are parsed correctly when
running neutron on nova-cloud-controller (legacy mode).

Closes-Bug: 1412496

138. By Liam Young on 2015-01-21

[james-page, r=gnuoy] Add kilo template

137. By Liam Young on 2015-01-14

[hopem, r=gnuoy] Adds nova-alchemy-flags option to allow [database] options
to be set in nova.conf as is currently supported for
neutron.conf.

Also changed 'sql_connection' to 'connection' and moved it all into [database] section since that has been the convention since at least Icehouse and is required for other db options.

136. By James Page on 2015-01-13

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

135. By James Page on 2015-01-13

[trivial] Resync helpers