Juju Charms Collection
swift-proxy package

Merge lp://staging/~adam-collard/charms/trusty/swift-proxy/add-pause-resume-actions into lp://staging/~openstack-charmers-archive/charms/trusty/swift-proxy/next

  1. Trusty Tahr (14.04)
  2. add-pause-resume-actions
  3. Merge into next
Proposed by Adam Collard
Status: Merged
Merged at revision: 109
Proposed branch: lp://staging/~adam-collard/charms/trusty/swift-proxy/add-pause-resume-actions
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/swift-proxy/next
Diff against target: 493 lines (+395/-19)
7 files modified
actions.yaml (+11/-0)
actions/actions.py (+83/-0)
charmhelpers/core/host.py (+32/-16)
metadata.yaml (+2/-1)
tests/basic_deployment.py (+54/-2)
tests/charmhelpers/contrib/amulet/utils.py (+9/-0)
unit_tests/test_actions.py (+204/-0)
To merge this branch: bzr merge lp://staging/~adam-collard/charms/trusty/swift-proxy/add-pause-resume-actions
Reviewer Review Type Date Requested Status
Chris Glass (community) Approve
Geoff Teale (community) Approve
Review via email: mp+270407@code.staging.launchpad.net

Description of the change

This branch adds actions for pausing and resuming services on swift-storage units.

In addition to just stopping the services, the actions also set the status of the unit to be "maintenance" with a message on how to resume.

Further refinements to the charm to support pause mode will be coming in follow-up branches, notably guarding calls to service_start and service_restart to prevent config-changed, *-relation-changed and other hooks from (re)-starting a unit which should be paused.

It's a mirror of https://code.launchpad.net/~adam-collard/charms/trusty/swift-storage/add-pause-resume-actions/+merge/268233

Note that this depends on charm-helpers from https://code.launchpad.net/~tealeg/charm-helpers/add-amulet-utils-status-get/+merge/270311

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #9595 swift-proxy-next for adam-collard mp270407
    LINT OK: passed

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

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

charm_unit_test #8833 swift-proxy-next for adam-collard mp270407
    UNIT OK: passed

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

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

charm_amulet_test #6319 swift-proxy-next for adam-collard mp270407
    AMULET OK: passed

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

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

charm_unit_test #8834 swift-proxy-next for adam-collard mp270407
    UNIT OK: passed

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

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

charm_lint_check #9596 swift-proxy-next for adam-collard mp270407
    LINT OK: passed

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

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

charm_amulet_test #6320 swift-proxy-next for adam-collard mp270407
    AMULET OK: passed

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

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

+1 Sometimes the unit-test + functional-test feels a bit belt-and-braces, but I suppose that's a good thing.

I'd like to see the status get tested in the functional side (As per the in line comment) but that can wait until it's all landed in charmhelpers.

review: Approve
lp://staging/~adam-collard/charms/trusty/swift-proxy/add-pause-resume-actions updated
114. By Adam Collard

Sync from tealeg's charm-helpers branch, add tests for status (tealeg's review)

Revision history for this message
Adam Collard (adam-collard) :
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #9708 swift-proxy-next for adam-collard mp270407
    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/12328244/
Build: http://10.245.162.77:8080/job/charm_lint_check/9708/

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

charm_unit_test #8937 swift-proxy-next for adam-collard mp270407
    UNIT OK: passed

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

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

charm_amulet_test #6333 swift-proxy-next for adam-collard mp270407
    AMULET OK: passed

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

lp://staging/~adam-collard/charms/trusty/swift-proxy/add-pause-resume-actions updated
115. By Adam Collard

Rename categories to tags (please the linter)

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

charm_lint_check #9715 swift-proxy-next for adam-collard mp270407
    LINT OK: passed

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

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

charm_unit_test #8948 swift-proxy-next for adam-collard mp270407
    UNIT OK: passed

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

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

charm_amulet_test #6346 swift-proxy-next for adam-collard mp270407
    AMULET OK: passed

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

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

Looks good! +1

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