lp:~openstack-charmers/charms/trusty/keystone/keystonev3

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:~openstack-charmers-archive/charms/trusty/keystone/next

OpenStack Charmers: Pending requested 2016-02-11

Diff: 3551 lines (+2443/-211) (has conflicts)

20 files modified

charm-helpers-tests.yaml (+2/-0)
charmhelpers/contrib/openstack/neutron.py (+13/-0)
charmhelpers/contrib/storage/linux/ceph.py (+38/-12)
config.yaml (+6/-0)
hooks/keystone_context.py (+8/-2)
hooks/keystone_hooks.py (+6/-0)
hooks/keystone_utils.py (+254/-98)
hooks/manager.py (+183/-3)
templates/liberty/policy.json (+382/-0)
templates/liberty/policy.json.v2 (+184/-0)
tests/basic_deployment.py (+208/-44)
tests/charmhelpers/contrib/openstack/amulet/utils.py (+34/-11)
tests/charmhelpers/core/__init__.py (+15/-0)
tests/charmhelpers/core/decorators.py (+57/-0)
tests/charmhelpers/core/hookenv.py (+978/-0)
unit_tests/test_actions.py (+14/-7)
unit_tests/test_actions_git_reinstall.py (+2/-1)
unit_tests/test_actions_openstack_upgrade.py (+9/-4)
unit_tests/test_keystone_hooks.py (+14/-5)
unit_tests/test_keystone_utils.py (+36/-24)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

216. By Liam Young on 2016-03-05

Fix unit_tests

215. By Liam Young on 2016-03-05

Role needs to created after user or grant fails

214. By Liam Young on 2016-03-05

Need to specifiy domain for user lookups with v3

213. By Liam Young on 2016-03-05

Remove cloud_admin user from tests

212. By Liam Young on 2016-03-05

Remove cloud_admin user

211. By Liam Young on 2016-03-04

Fix typo

210. By Liam Young on 2016-03-04

Fix lint

209. By Liam Young on 2016-03-03

Fix api v2

208. By Liam Young on 2016-03-03

Import problems

207. By Liam Young on 2016-03-03

Catch exception when keystone is down