Merge lp://qastaging/~1chb1n/charms/trusty/keystone/kilo-support into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Proposed by
Ryan Beisner
Status: | Merged |
---|---|
Merged at revision: | 117 |
Proposed branch: | lp://qastaging/~1chb1n/charms/trusty/keystone/kilo-support |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next |
Diff against target: |
159 lines (+149/-0) 2 files modified
templates/kilo/keystone.conf (+105/-0) templates/kilo/logging.conf (+44/-0) |
To merge this branch: | bzr merge lp://qastaging/~1chb1n/charms/trusty/keystone/kilo-support |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Diogo Matsubara (community) | Approve | ||
Review via email: mp+248456@code.qastaging.launchpad.net |
Description of the change
Resolves Trusty-Kilo config-changed hook fail for https:/
Adds templates for kilo and fixes token section to point to the correct driver module: "driver = keystone.
Pulled from matsubara's trunk MP, to test in OSCI overnight (thanks Diogo!).
To post a comment you must log in.
charm_lint_check #1515 keystone-next for 1chb1n mp248456
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/1515/