openstack/devstack
Code Issues Proposed changes

Merge "Set fixed-key key manager"

Browse Source
This commit is contained in:
Jenkins 2017-04-25 23:42:18 +00:00 committed by Gerrit Code Review
commit 2eb322ab2e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cinder
View File

@ -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=""

2
lib/nova
View File

@ -466,6 +466,8 @@ function create_nova_conf {
iniset $NOVA_CONF DEFAULT osapi_compute_listen "$NOVA_SERVICE_LISTEN_ADDRESS"
iniset $NOVA_CONF DEFAULT metadata_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