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
openstack · Nov 21, 2016 · a5b72b0 · a5b72b0
1 parent 5dbb826
commit a5b72b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/lib/cinder b/lib/cinder
@@ -283,6 +283,8 @@ function configure_cinder {
 
     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=""

diff --git a/lib/nova b/lib/nova
@@ -475,6 +475,8 @@ function create_nova_conf {
     iniset $NOVA_CONF DEFAULT metadata_listen "$NOVA_SERVICE_LISTEN_ADDRESS"
     iniset $NOVA_CONF DEFAULT s3_listen "$NOVA_SERVICE_LISTEN_ADDRESS"
 
+    iniset $NOVA_CONF key_manager api_class nova.keymgr.conf_key_mgr.ConfKeyManager
+
     if is_fedora || is_suse; then
         # nova defaults to /usr/local/bin, but fedora and suse pip like to
         # install things in /usr/bin