lp://qastaging/~brad-marshall/charms/trusty/nova-cloud-controller/add-haproxy-nrpe-fix-servicegroups
Created by
Brad Marshall
and last modified
- Get this branch:
- bzr branch lp://qastaging/~brad-marshall/charms/trusty/nova-cloud-controller/add-haproxy-nrpe-fix-servicegroups
Only
Brad Marshall
can upload to this branch. If you are
Brad Marshall
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
Merged
into
lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
at
revision 142
- Liam Young (community): Approve
-
Diff: 1247 lines (+861/-47)21 files modifiedconfig.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)
Branch information
- Owner:
- Brad Marshall
- Status:
- Development
Recent revisions
- 139. By Edward Hope-Morley
-
[hopem,r=gnuoy]
Ensure that multiple vips are parsed correctly when
running neutron on nova-cloud-controller (legacy mode). Closes-Bug: 1412496
- 137. By Liam Young
-
[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
-
[james-
page,r= gnuoy] Add fallback configuration options for vip cidr and iface for non-standard deployments
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)