Juju Charms Collection
swift-storage package

Merge lp://qastaging/~adam-collard/charms/trusty/swift-storage/conditional-service-restart-stable into lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk

  1. Trusty Tahr (14.04)
  2. conditional-service-restart-stable
  3. Merge into trunk
Proposed by Adam Collard
Status: Merged
Merged at revision: 70
Proposed branch: lp://qastaging/~adam-collard/charms/trusty/swift-storage/conditional-service-restart-stable
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk
Diff against target: 194 lines (+19/-49)
7 files modified
hooks/charmhelpers/cli/__init__.py (+1/-5)
hooks/charmhelpers/cli/commands.py (+4/-4)
hooks/charmhelpers/contrib/openstack/utils.py (+7/-5)
hooks/charmhelpers/contrib/storage/linux/utils.py (+3/-2)
hooks/charmhelpers/core/hookenv.py (+1/-20)
hooks/charmhelpers/core/host.py (+2/-2)
tests/basic_deployment.py (+1/-11)
To merge this branch: bzr merge lp://qastaging/~adam-collard/charms/trusty/swift-storage/conditional-service-restart-stable
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+270030@code.qastaging.launchpad.net

Description of the change

Backport r79 to stable.

See https://code.launchpad.net/~adam-collard/charms/trusty/swift-storage/fix-unconditional-service-restart/+merge/269744 for next MP.

"This branch prevents the swift-storage charm from thinking there was an OpenStack upgrade available at every config-changed.

I had to update the Amulet tests because they were incorrectly asserting that all of the swift services should have been restarted following a change to object-server-threads-per-disk. In fact, only the object services should be restarted, and only are (the test passed prior to this because of the bug in charm-helpers which caused the unconditional OpenStack upgrade, in turn restarting all of the services)"

This relies on stable charm-helpers branch from https://code.launchpad.net/~adam-collard/charm-helpers/openstack-upgrade-available-swift-stable/+merge/270028

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

charm_lint_check #9318 swift-storage for adam-collard mp270030
    LINT OK: passed

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

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

charm_unit_test #8616 swift-storage for adam-collard mp270030
    UNIT OK: passed

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

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

charm_lint_check #9322 swift-storage for adam-collard mp270030
    LINT OK: passed

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

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

charm_unit_test #8621 swift-storage for adam-collard mp270030
    UNIT OK: passed

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

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

charm_amulet_test #6232 swift-storage for adam-collard mp270030
    AMULET OK: passed

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

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