Juju Charms Collection
nova-compute package

Merge lp://qastaging/~brad-marshall/charms/trusty/nova-compute/fix-nagios into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next

  1. Trusty Tahr (14.04)
  2. fix-nagios
  3. Merge into next
Proposed by Brad Marshall
Status: Merged
Merged at revision: 106
Proposed branch: lp://qastaging/~brad-marshall/charms/trusty/nova-compute/fix-nagios
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 1649 lines (+48/-902)
9 files modified
config.yaml (+6/-0)
hooks/charmhelpers/contrib/hahelpers/ceph.py (+0/-294)
hooks/charmhelpers/contrib/openstack/context.py (+28/-9)
hooks/charmhelpers/contrib/openstack/files/__init__.py (+0/-18)
hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh (+0/-32)
hooks/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh (+0/-30)
hooks/charmhelpers/contrib/openstack/templates/zeromq (+14/-0)
hooks/charmhelpers/core/strutils.py (+0/-42)
hooks/charmhelpers/core/unitdata.py (+0/-477)
To merge this branch: bzr merge lp://qastaging/~brad-marshall/charms/trusty/nova-compute/fix-nagios
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+250703@code.qastaging.launchpad.net

Description of the change

Synced charmhelpers, added nagios_servicegroup config option

To post a comment you must log in.
lp://qastaging/~brad-marshall/charms/trusty/nova-compute/fix-nagios updated
105. By Edward Hope-Morley

[trivial] charmhelpers sync

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

charm_lint_check #2218 nova-compute-next for brad-marshall mp250703
    LINT OK: passed

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

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

charm_unit_test #2007 nova-compute-next for brad-marshall mp250703
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
  FAILED (SKIP=5, failures=1)
  make: *** [unit_test] Error 1

Full unit test output: http://paste.ubuntu.com/10396098/
Build: http://10.245.162.77:8080/job/charm_unit_test/2007/

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

charm_amulet_test #2164 nova-compute-next for brad-marshall mp250703
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

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

lp://qastaging/~brad-marshall/charms/trusty/nova-compute/fix-nagios updated
106. By Brad Marshall

[bradm] Fixed text 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