From 9ad69a9e9d86abdd192f9d418f189d71c170bc59 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Thu, 5 Oct 2017 12:48:56 +0000
Subject: [PATCH] Workaround bad cinder defaults

key_manager/backend default value is 'barbican'.
While castellan resolves this to a class using stevedore,
cinder loads it tries to load it directly.
So it fails if the value of backend is not set to a full class.

Change-Id: Ia8417bbdac3f515e42d1ed760110a63ae14f8f00
Partial-Bug: #1721037
---
 templates/cinder.conf.j2 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/templates/cinder.conf.j2 b/templates/cinder.conf.j2
index cba061b5..88707c22 100644
--- a/templates/cinder.conf.j2
+++ b/templates/cinder.conf.j2
@@ -127,7 +127,13 @@ hmac_keys = {{ cinder_profiler_hmac_key }}
 auth_endpoint = {{ keystone_service_internaluri }}/v3
 
 [key_manager]
-api_class = castellan.key_manager.barbican_key_manager.BarbicanKeyManager
+backend = castellan.key_manager.barbican_key_manager.BarbicanKeyManager
+{% else %}
+{# WORKAROUND KEY MANAGER DEFAULT STRING ISSUE #}
+{# See also: https://bugs.launchpad.net/cinder/+bug/1721236 #}
+{# And:  https://review.openstack.org/#/c/468252/ #}
+[key_manager]
+backend = cinder.keymgr.conf_key_mgr.ConfKeyManager
 {% endif %}
 
 [keystone_authtoken]