x
/
tobiko
Code Issues Proposed changes

Set nova keyfile only if value is given 

Change-Id: Ib3ec8038c7c75d737bbd6fbff649afb341ff4b16
This commit is contained in:
Federico Ressi 2020-04-17 20:15:21 +02:00
parent 2aa770a5ed
commit 4e7af0fb85
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/plugin.sh
View File

@ -131,7 +131,9 @@ function configure_tobiko_nova {
# Write key_file
local key_file=${TOBIKO_NOVA_KEY_FILE:-}
iniset "${tobiko_conf_file}" nova key_file "${key_file}"
if [ "${key_file}" != "" ]; then
iniset "${tobiko_conf_file}" nova key_file "${key_file}"
fi
}

2
devstack/settings
View File

@ -35,7 +35,7 @@ TOBIKO_KEYSTONE_TRUST_ID=${TOBIKO_KEYSTONE_TRUST_ID:-}
TOBIKO_KEYSTONE_USER_ROLE=${TOBIKO_KEYSTONE_USER_ROLE:-admin}
# --- Nova settings ---
TOBIKO_NOVA_KEY_FILE=${TOBIKO_NOVA_KEY_FILE:-~/.ssh/id_rsa}
TOBIKO_NOVA_KEY_FILE=${TOBIKO_NOVA_KEY_FILE:-}
# --- Neutron settings ---
TOBIKO_NEUTRON_FLOATING_NETWORK=${TOBIKO_NEUTRON_FLOATING_NETWORK:-${PUBLIC_NETWORK_NAME}}