Juju Charms Collection
swift-storage package

Merge lp://staging/~adam-collard/charms/trusty/swift-storage/fix-service-status into lp://staging/~openstack-charmers-archive/charms/trusty/swift-storage/next

  1. Trusty Tahr (14.04)
  2. fix-service-status
  3. Merge into next
Proposed by Adam Collard
Status: Merged
Merged at revision: 73
Proposed branch: lp://staging/~adam-collard/charms/trusty/swift-storage/fix-service-status
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/swift-storage/next
Diff against target: 543 lines (+178/-93)
11 files modified
charmhelpers/cli/__init__.py (+1/-5)
charmhelpers/cli/commands.py (+4/-4)
charmhelpers/contrib/openstack/amulet/deployment.py (+2/-2)
charmhelpers/contrib/openstack/utils.py (+51/-14)
charmhelpers/contrib/storage/linux/utils.py (+3/-2)
charmhelpers/core/hookenv.py (+1/-20)
charmhelpers/core/host.py (+2/-2)
charmhelpers/fetch/__init__.py (+8/-0)
tests/basic_deployment.py (+20/-21)
tests/charmhelpers/contrib/amulet/utils.py (+84/-21)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+2/-2)
To merge this branch: bzr merge lp://staging/~adam-collard/charms/trusty/swift-storage/fix-service-status
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+268228@code.staging.launchpad.net

Description of the change

Sync charm-helpers and use the (new-ish) validate_services_by_name() utility to properly check that all swift services are starting.

To post a comment you must log in.
lp://staging/~adam-collard/charms/trusty/swift-storage/fix-service-status updated
75. By Adam Collard

Fix typo

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

charm_lint_check #8194 swift-storage-next for adam-collard mp268228
    LINT OK: passed

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

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

charm_unit_test #7596 swift-storage-next for adam-collard mp268228
    UNIT OK: passed

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

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

charm_lint_check #8195 swift-storage-next for adam-collard mp268228
    LINT OK: passed

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

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

charm_unit_test #7597 swift-storage-next for adam-collard mp268228
    UNIT OK: passed

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

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

charm_amulet_test #5840 swift-storage-next for adam-collard mp268228
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

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

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

charm_amulet_test #5841 swift-storage-next for adam-collard mp268228
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/5841/

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

Approved

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