Merge lp://qastaging/~hopem/charms/trusty/keystone/fix-pki-token-support into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 129
Proposed branch: lp://qastaging/~hopem/charms/trusty/keystone/fix-pki-token-support
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next
Diff against target: 1010 lines (+382/-126)
8 files modified
hooks/keystone_context.py (+28/-3)
hooks/keystone_hooks.py (+66/-21)
hooks/keystone_ssl.py (+76/-43)
hooks/keystone_utils.py (+98/-31)
templates/icehouse/keystone.conf (+9/-3)
templates/parts/section-signing (+13/-0)
unit_tests/test_keystone_hooks.py (+77/-14)
unit_tests/test_keystone_utils.py (+15/-11)
To merge this branch: bzr merge lp://qastaging/~hopem/charms/trusty/keystone/fix-pki-token-support
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+249881@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #2133 keystone-next for hopem mp249881
    LINT OK: passed

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

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

charm_unit_test #1922 keystone-next for hopem mp249881
    UNIT OK: passed

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

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

charm_amulet_test #2041 keystone-next for hopem mp249881
    AMULET OK: passed

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

123. By Edward Hope-Morley

synced /next

124. By Edward Hope-Morley

synced charm-helpers;

125. By Edward Hope-Morley

don't push race-prone data on cluster relation to avoid spinning

126. By Edward Hope-Morley

remove pkiz

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

charm_lint_check #2206 keystone-next for hopem mp249881
    LINT OK: passed

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

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

charm_unit_test #1995 keystone-next for hopem mp249881
    UNIT OK: passed

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

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

charm_amulet_test #2152 keystone-next for hopem mp249881
    AMULET FAIL: amulet-test failed

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

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

127. By Edward Hope-Morley

synced /next

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

charm_lint_check #2560 keystone-next for hopem mp249881
    LINT OK: passed

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

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

charm_unit_test #2350 keystone-next for hopem mp249881
    UNIT OK: passed

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

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

charm_amulet_test #2429 keystone-next for hopem mp249881
    AMULET FAIL: juju-pull-logs failed

AMULET Results (max last 2 lines):
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 3 passed, 0 failed, 0 errored

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

128. By Edward Hope-Morley

cleanuo

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

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

charm_lint_check #2604 keystone-next for hopem mp249881
    LINT OK: passed

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

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

charm_unit_test #2394 keystone-next for hopem mp249881
    UNIT OK: passed

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

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

charm_amulet_test #2432 keystone-next for hopem mp249881
    AMULET OK: passed

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

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