Juju Charms Collection
neutron-api package

Merge lp://qastaging/~brad-marshall/charms/trusty/neutron-api/add-haproxy-nrpe-fix-servicegroups into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

  1. Trusty Tahr (14.04)
  2. add-haproxy-nrpe-fix-servicegroups
  3. Merge into next
Proposed by Brad Marshall
Status: Merged
Merged at revision: 81
Proposed branch: lp://qastaging/~brad-marshall/charms/trusty/neutron-api/add-haproxy-nrpe-fix-servicegroups
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 1455 lines (+264/-499)
16 files modified
Makefile (+1/-1)
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/context.py (+28/-9)
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/templates/zeromq (+14/-0)
hooks/charmhelpers/contrib/openstack/utils.py (+1/-0)
hooks/charmhelpers/core/fstab.py (+2/-2)
hooks/charmhelpers/core/strutils.py (+42/-0)
hooks/charmhelpers/core/unitdata.py (+0/-477)
hooks/neutron_api_hooks.py (+2/-0)
To merge this branch: bzr merge lp://qastaging/~brad-marshall/charms/trusty/neutron-api/add-haproxy-nrpe-fix-servicegroups
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+250705@code.qastaging.launchpad.net

Description of the change

Synced charmhelpers, added nagios_servicegroup config option, and added haproxy nrpe checks.

To post a comment you must log in.
lp://qastaging/~brad-marshall/charms/trusty/neutron-api/add-haproxy-nrpe-fix-servicegroups updated
80. By Edward Hope-Morley

[trivial] charmhelpers sync

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #2220 neutron-api-next for brad-marshall mp250705
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2220/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #2009 neutron-api-next for brad-marshall mp250705
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2009/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #2166 neutron-api-next for brad-marshall mp250705
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/10396810/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2166/

lp://qastaging/~brad-marshall/charms/trusty/neutron-api/add-haproxy-nrpe-fix-servicegroups updated
81. By Brad Marshall

[bradm] Fixed merge conflicts

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches