Juju Charms Collection
cinder package

Merge lp:~james-page/charms/trusty/cinder/lp1516085 into lp:~openstack-charmers-archive/charms/trusty/cinder/next

  1. Trusty Tahr (14.04)
  2. lp1516085
  3. Merge into next
Proposed by James Page
Status: Merged
Merged at revision: 137
Proposed branch: lp:~james-page/charms/trusty/cinder/lp1516085
Merge into: lp:~openstack-charmers-archive/charms/trusty/cinder/next
Diff against target: 12 lines (+5/-0)
1 file modified
templates/kilo/cinder.conf (+5/-0)
To merge this branch: bzr merge lp:~james-page/charms/trusty/cinder/lp1516085
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+280563@code.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 #15435 cinder-next for james-page mp280563
    LINT OK: passed

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

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

charm_unit_test #14399 cinder-next for james-page mp280563
    UNIT OK: passed

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

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

charm_amulet_test #8300 cinder-next for james-page mp280563
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
Timeout occurred (2700s), printing juju status...environment: osci-sv17
ERROR:root:Make target returned non-zero.

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

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

Approved

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

charm_amulet_test #8302 cinder-next for james-page mp280563
    AMULET OK: passed

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

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

\o/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/kilo/cinder.conf'
2--- templates/kilo/cinder.conf 2015-03-25 09:25:34 +0000
3+++ templates/kilo/cinder.conf 2015-12-15 10:21:09 +0000
4@@ -61,3 +61,8 @@
5
6 [oslo_concurrency]
7 lock_path = /var/lock/cinder
8+
9+[keymgr]
10+# XXX: hack to work around http://pad.lv/1516085
11+# will be superceeded by SRU to cinder package
12+encryption_auth_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v3

Subscribers

People subscribed via source and target branches