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
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://bugs.launchpad.net/charms/+source/keystone/+bug/1417211.

Adds templates for kilo and fixes token section to point to the correct driver module: "driver = keystone.token.persistence.backends.sql.Token"

Pulled from matsubara's trunk MP, to test in OSCI overnight (thanks Diogo!).

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

charm_lint_check #1515 keystone-next for 1chb1n mp248456
    LINT OK: passed

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

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

charm_unit_test #1470 keystone-next for 1chb1n mp248456
    UNIT OK: passed

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

Revision history for this message
Ryan Beisner (1chb1n) wrote :

Manual deploy tests by Diogo on dellstack and by me on serverstack confirm general T:K happiness, though I want to wait for OSCI's full deployment tests to run to proceed on this.

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

charm_lint_check #1516 keystone-next for 1chb1n mp248456
    LINT OK: passed

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

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

charm_unit_test #1471 keystone-next for 1chb1n mp248456
    UNIT OK: passed

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

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

charm_amulet_test #1634 keystone-next for 1chb1n mp248456
    AMULET OK: passed

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

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

charm_amulet_test #1635 keystone-next for 1chb1n mp248456
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 124
  make: *** [test] Error 124

Full amulet test output: http://paste.ubuntu.com/10043093/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1635/

Revision history for this message
Ryan Beisner (1chb1n) wrote :

Safe to disregard amulet test #1635, undercloud bootstrapping issue.

Revision history for this message
Diogo Matsubara (matsubara) wrote :

It looks all right to me.

review: Approve
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