commit a5b72b053efec9af8a57c59b35f96142e4f38433
author Kaitlin Farr <kaitlin.farr@jhuapl.edu> Tue Jan 26 22:46:13 2016 -0500
committer Kaitlin Farr <kaitlin.farr@jhuapl.edu> Mon Nov 21 13:50:57 2016 -0500
tree bb2ff4a03a2fe539970958582cf141b63cd4d37f
parent 5dbb826a547195b3cc33ff4f30f6d79d0ae08045

Set fixed-key key manager

With the key manager refactoring in nova and cinder, the key manager
class will need to be explicitly set.

Nova key manager refactoring: Ib563b0ea4b8b4bc1833bf52bf49a68546c384996
Cinder key manager refactoring: Ief8885bb4ca8d62b03cf1a52c25dd0e62c835bfe

Change-Id: I733279864ee1a4aaffc9c8eed81b5e12f8d8821b
Implements: blueprint use-castellan-key-manager

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index c4a49cd..c7ce0f5 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -283,6 +283,8 @@
 
     iniset $CINDER_CONF DEFAULT os_region_name "$REGION_NAME"
 
+    iniset $CINDER_CONF key_manager api_class cinder.keymgr.conf_key_mgr.ConfKeyManager
+
     if is_service_enabled c-vol && [[ -n "$CINDER_ENABLED_BACKENDS" ]]; then
         local enabled_backends=""
         local default_name=""