Browse code

Merge "Set fixed-key key manager"

Jenkins authored on 2017/04/26 08:42:18
Showing 2 changed files
... ...
@@ -283,6 +283,8 @@ function configure_cinder {
283 283
 
284 284
     iniset $CINDER_CONF DEFAULT os_region_name "$REGION_NAME"
285 285
 
286
+    iniset $CINDER_CONF key_manager api_class cinder.keymgr.conf_key_mgr.ConfKeyManager
287
+
286 288
     if is_service_enabled c-vol && [[ -n "$CINDER_ENABLED_BACKENDS" ]]; then
287 289
         local enabled_backends=""
288 290
         local default_name=""
... ...
@@ -466,6 +466,8 @@ function create_nova_conf {
466 466
     iniset $NOVA_CONF DEFAULT osapi_compute_listen "$NOVA_SERVICE_LISTEN_ADDRESS"
467 467
     iniset $NOVA_CONF DEFAULT metadata_listen "$NOVA_SERVICE_LISTEN_ADDRESS"
468 468
 
469
+    iniset $NOVA_CONF key_manager api_class nova.keymgr.conf_key_mgr.ConfKeyManager
470
+
469 471
     if is_fedora || is_suse; then
470 472
         # nova defaults to /usr/local/bin, but fedora and suse pip like to
471 473
         # install things in /usr/bin