lp:~ajkavanagh/charms/trusty/keystone/add-service-checks-lp1524388
- Get this branch:
- bzr branch lp:~ajkavanagh/charms/trusty/keystone/add-service-checks-lp1524388
Branch merges
- David Ames (community): Approve
-
Diff: 220 lines (+109/-5)6 files modifiedcharmhelpers/contrib/network/ip.py (+15/-0)
charmhelpers/contrib/openstack/context.py (+5/-1)
charmhelpers/contrib/openstack/templates/section-keystone-authtoken (+11/-0)
charmhelpers/contrib/openstack/utils.py (+73/-2)
hooks/keystone_utils.py (+2/-1)
unit_tests/test_keystone_utils.py (+3/-1)
Related bugs
Related blueprints
Branch information
- Owner:
- Alex Kavanagh
- Status:
- Merged
Recent revisions
- 200. By Alex Kavanagh
-
Synced new version of charm-helpers from:
lp:~ajkavanagh/charm-helpers/add-service-checks-lp1524388
Added call to services() and determined_ports() for the assess_status()
call. - 199. By Alex Kavanagh
-
Synced in lp:~ajkavanagh/charm-helpers/add-service-checks-lp1524388 version
of charm-helpers to test that modification will work - this is for demo
purposes only and will be revised prior to merge proposal.Also changed tests to to work with revision 514:
"misc changes for haproxy template and context ..."
which required changes to the test_haproxy_context_ service_ enabled test
in unit_tests/test_keystone_ contexts. py - 198. By Alex Kavanagh
-
Change set_os_
workload_ status( ...) call to assess_status(...) call in hooks/keystone_ hooks.py: main This is so that invoking keystone_hooks.py directly doesn't clobber a user set paused state.
- 197. By Alex Kavanagh
-
Change pause/resume actions use (new) assess_status()
Implemented new is_paused() and assess_status() functions, and changed
the pause and resume actions to use them. Changed existing and added new
tests to verify functionality. - 196. By Liam Young
-
[hopem, r=gnuoy] Fix upgrade breakage whereby if upgrading from
version of charm that did not support
db-initialised peer setting db ops get stuck
waiting infinitely for db to be intialised.Closes-Bug: 1519035
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)