Juju Charms Collection
swift-storage package

Merge lp://staging/~brad-marshall/charms/trusty/swift-storage/add-nrpe-checks-fix-rsyncd-conf into lp://staging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk

  1. Trusty Tahr (14.04)
  2. add-nrpe-checks-fix-rsyncd-conf
  3. Merge into trunk
Proposed by Brad Marshall
Status: Merged
Merged at revision: 54
Proposed branch: lp://staging/~brad-marshall/charms/trusty/swift-storage/add-nrpe-checks-fix-rsyncd-conf
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk
Diff against target: 959 lines (+736/-30)
16 files modified
charm-helpers-hooks.yaml (+1/-0)
config.yaml (+14/-0)
files/nrpe-external-master/check_swift_service (+25/-0)
files/nrpe-external-master/check_swift_storage.py (+136/-0)
files/sudo/swift-storage (+1/-0)
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+219/-0)
hooks/charmhelpers/contrib/charmsupport/rsync.py (+32/-0)
hooks/charmhelpers/contrib/charmsupport/volumes.py (+156/-0)
hooks/swift_storage_hooks.py (+77/-1)
hooks/swift_storage_utils.py (+31/-3)
metadata.yaml (+3/-0)
templates/001-baseconfig (+6/-0)
templates/050-swift-storage.conf (+24/-0)
templates/rsyncd.conf (+0/-23)
unit_tests/test_swift_storage_relations.py (+10/-3)
unit_tests/test_swift_storage_utils.py (+1/-0)
To merge this branch: bzr merge lp://staging/~brad-marshall/charms/trusty/swift-storage/add-nrpe-checks-fix-rsyncd-conf
Reviewer Review Type Date Requested Status
Liam Young (community) Disapprove
Review via email: mp+241483@code.staging.launchpad.net

Description of the change

This adds support for nrpe-external-master, and adds some basic nrpe checks.

This relies on my nrpe-external-master branch lp:~brad-marshall/charms/trusty/nrpe-external-master/fix-rsyncd-conf.

To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) wrote :

UOSCI bot says:
charm_lint_check #986 trusty-swift-storage for brad-marshall mp241483
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
  hooks/swift_storage_hooks.py:165:80: E501 line too long (90 > 79 characters)
  hooks/swift_storage_hooks.py:174:22: E251 unexpected spaces around keyword / parameter equals
  hooks/swift_storage_hooks.py:174:24: E251 unexpected spaces around keyword / parameter equals
  hooks/swift_storage_utils.py:267:1: W391 blank line at end of file
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/8955703/
Build: http://10.98.191.181:8080/job/charm_lint_check/986/

Revision history for this message
Ryan Beisner (1chb1n) wrote :

UOSCI bot says:
charm_unit_test #821 trusty-swift-storage for brad-marshall mp241483
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  swift_storage_utils 113 10 91% 253-254, 259-266
  TOTAL 238 37 84%
  Ran 33 tests in 1.198s
  FAILED (errors=3, failures=2)
  make: *** [unit_test] Error 1

Full unit test output: http://paste.ubuntu.com/8955704/
Build: http://10.98.191.181:8080/job/charm_unit_test/821/

Revision history for this message
Ryan Beisner (1chb1n) wrote :

UOSCI bot says:
charm_amulet_test #366 trusty-swift-storage for brad-marshall mp241483
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Tearing down osci-sv07 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  juju-test INFO : Results: 1 passed, 2 failed, 0 errored
  ERROR subprocess encountered error code 2
  make: *** [test] Error 2

Full amulet test output: http://paste.ubuntu.com/8955844/
Build: http://10.98.191.181:8080/job/charm_amulet_test/366/

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

UOSCI bot says:
charm_lint_check #1241 trusty-swift-storage for brad-marshall mp241483
    LINT FAIL: lint-test failed

LINT Results (max last 5 lines):
  hooks/swift_storage_hooks.py:165:80: E501 line too long (90 > 79 characters)
  hooks/swift_storage_hooks.py:174:22: E251 unexpected spaces around keyword / parameter equals
  hooks/swift_storage_hooks.py:174:24: E251 unexpected spaces around keyword / parameter equals
  hooks/swift_storage_utils.py:267:1: W391 blank line at end of file
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9281254/
Build: http://10.98.191.181:8080/job/charm_lint_check/1241/

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

UOSCI bot says:
charm_unit_test #1075 trusty-swift-storage for brad-marshall mp241483
    UNIT FAIL: unit-test failed

UNIT Results (max last 5 lines):
  swift_storage_utils 113 10 91% 253-254, 259-266
  TOTAL 238 37 84%
  Ran 33 tests in 1.187s
  FAILED (errors=3, failures=2)
  make: *** [unit_test] Error 1

Full unit test output: http://paste.ubuntu.com/9281255/
Build: http://10.98.191.181:8080/job/charm_unit_test/1075/

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

UOSCI bot says:
charm_amulet_test #544 trusty-swift-storage for brad-marshall mp241483
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  WARNING cannot delete security group "juju-osci-sv05". Used by another environment?
  WARNING cannot delete security group "juju-osci-sv05-0". Used by another environment?
  juju-test INFO : Results: 1 passed, 2 failed, 0 errored
  ERROR subprocess encountered error code 2
  make: *** [test] Error 2

Full amulet test output: http://paste.ubuntu.com/9281356/
Build: http://10.98.191.181:8080/job/charm_amulet_test/544/

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

Thanks for this branch. I've taken it and fixed up a few minor bits and proposed it against the 'next' branch. It has now landed into 'next' and will promulgate to staging at the end of the month as part of the 15.01 openstack charm release.

review: Disapprove

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