Merge lp:~ajkavanagh/charms/trusty/keystone/use-assess-status-lp1531767 into lp:~openstack-charmers-archive/charms/trusty/keystone/next
Proposed by
Alex Kavanagh
Status: | Merged |
---|---|
Merged at revision: | 202 |
Proposed branch: | lp:~ajkavanagh/charms/trusty/keystone/use-assess-status-lp1531767 |
Merge into: | lp:~openstack-charmers-archive/charms/trusty/keystone/next |
Diff against target: |
294 lines (+109/-48) (has conflicts) 5 files modified
actions/actions.py (+10/-5) hooks/keystone_hooks.py (+5/-3) hooks/keystone_utils.py (+35/-0) unit_tests/test_actions.py (+22/-40) unit_tests/test_keystone_utils.py (+37/-0) Text conflict in hooks/keystone_hooks.py Text conflict in unit_tests/test_keystone_utils.py |
To merge this branch: | bzr merge lp:~ajkavanagh/charms/trusty/keystone/use-assess-status-lp1531767 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
David Ames (community) | Approve | ||
Review via email: mp+282453@code.launchpad.net |
Description of the change
For the pause/resume actions implementation, uses a new is_paused() and assess_status(...) functions that have been added to hooks/keystone_
This means that the pause/resume no longer just use status_set() but rather, when resuming, the unit checks to see whether it can become active via set_os_
To post a comment you must log in.
charm_lint_check #17247 keystone-next for ajkavanagh mp282453
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/17247/