Merge lp://staging/~hopem/charms/trusty/cinder/pki-token-support into lp://staging/~openstack-charmers-archive/charms/trusty/cinder/next

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 77
Proposed branch: lp://staging/~hopem/charms/trusty/cinder/pki-token-support
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/cinder/next
Diff against target: 123 lines (+48/-11)
5 files modified
hooks/charmhelpers/contrib/openstack/context.py (+28/-9)
hooks/charmhelpers/contrib/openstack/templates/zeromq (+14/-0)
hooks/cinder_hooks.py (+1/-0)
hooks/cinder_utils.py (+3/-1)
templates/icehouse/cinder.conf (+2/-1)
To merge this branch: bzr merge lp://staging/~hopem/charms/trusty/cinder/pki-token-support
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+250170@code.staging.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 #2134 cinder-next for hopem mp250170
    LINT OK: passed

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

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

charm_unit_test #1923 cinder-next for hopem mp250170
    UNIT OK: passed

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

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

charm_amulet_test #2042 cinder-next for hopem mp250170
    AMULET OK: passed

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

75. By Edward Hope-Morley

synced /next

76. By Edward Hope-Morley

synced charm-helpers;

77. By Edward Hope-Morley

ensure apache2 stop+start if config changed

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

charm_lint_check #2207 cinder-next for hopem mp250170
    LINT OK: passed

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

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

charm_unit_test #1996 cinder-next for hopem mp250170
    UNIT OK: passed

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

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

charm_amulet_test #2153 cinder-next for hopem mp250170
    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/10396306/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2153/

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