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

[James Page]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #15439 cinder for james-page mp280612
    LINT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #14406 cinder for james-page mp280612
    UNIT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8306 cinder for james-page mp280612
    AMULET OK: passed

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

[David Ames (thedac)]

Passed tests. Merging.

review: Approve

=== modified file 'templates/kilo/cinder.conf'
--- templates/kilo/cinder.conf	2015-03-25 09:25:34 +0000
+++ templates/kilo/cinder.conf	2015-12-15 15:59:18 +0000
@@ -61,3 +61,8 @@
 
 [oslo_concurrency]
 lock_path = /var/lock/cinder
+
+[keymgr]
+# XXX: hack to work around http://pad.lv/1516085
+#      will be superceeded by SRU to cinder package
+encryption_auth_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v3