Juju Charms Collection
swift-proxy package

Merge lp://staging/~adam-collard/charms/trusty/swift-proxy/guard-paused-unit-service-restarts into lp://staging/~openstack-charmers-archive/charms/trusty/swift-proxy/next

  1. Trusty Tahr (14.04)
  2. guard-paused-unit-service-restarts
  3. Merge into next
Proposed by Adam Collard
Status: Merged
Merged at revision: 110
Proposed branch: lp://staging/~adam-collard/charms/trusty/swift-proxy/guard-paused-unit-service-restarts
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/swift-proxy/next
Prerequisite: lp://staging/~adam-collard/charms/trusty/swift-proxy/add-pause-resume-actions
Diff against target: 214 lines (+83/-15)
4 files modified
hooks/swift_hooks.py (+19/-14)
lib/swift_utils.py (+19/-1)
tests/basic_deployment.py (+33/-0)
unit_tests/test_swift_utils.py (+12/-0)
To merge this branch: bzr merge lp://staging/~adam-collard/charms/trusty/swift-proxy/guard-paused-unit-service-restarts
Reviewer Review Type Date Requested Status
Chris Glass (community) Approve
Geoff Teale (community) Approve
Review via email: mp+270641@code.staging.launchpad.net

Description of the change

This is a follow up branch to https://code.launchpad.net/~adam-collard/charms/trusty/swift-proxy/add-pause-resume-actions/+merge/270407 to prevent config-changed and other hooks from blindly (re)starting services when the unit is paused.

Normal flow is pause(), (optionally) change config -> changes should be persisted on disk, but nothing started. resume() -> services started.

It's a mirror of https://code.launchpad.net/~adam-collard/charms/trusty/swift-storage/guard-paused-unit-service-restarts/+merge/269860

To post a comment you must log in.
lp://staging/~adam-collard/charms/trusty/swift-proxy/guard-paused-unit-service-restarts updated
114. By Adam Collard

Back out accidental commit of pointer to tealeg's charm-helpers branch

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

charm_lint_check #9702 swift-proxy-next for adam-collard mp270641
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12328231/
Build: http://10.245.162.77:8080/job/charm_lint_check/9702/

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

charm_unit_test #8938 swift-proxy-next for adam-collard mp270641
    UNIT OK: passed

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

lp://staging/~adam-collard/charms/trusty/swift-proxy/guard-paused-unit-service-restarts updated
115. By Adam Collard

Merge from ../add-pause-resume-actions/

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

charm_lint_check #9716 swift-proxy-next for adam-collard mp270641
    LINT OK: passed

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

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

charm_unit_test #8947 swift-proxy-next for adam-collard mp270641
    UNIT OK: passed

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

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

charm_amulet_test #6342 swift-proxy-next for adam-collard mp270641
    AMULET OK: passed

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

Revision history for this message
Geoff Teale (tealeg) wrote :

+1

review: Approve
Revision history for this message
Chris Glass (tribaal) wrote :

+1, Merged.

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