x
/
tobiko
Code Issues Proposed changes

Merge "Remove configuration of flavor in DevStack plugin"

This commit is contained in:
Zuul 2019-07-05 18:46:38 +00:00 committed by Gerrit Code Review
parent 797b8563ba 00473e02bf
commit 856ca9ac05
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devstack/plugin.sh
View File

@ -118,15 +118,6 @@ function configure_tobiko_nova {
echo_summary "Write [nova] section to ${TOBIKO_CONFIG}"
local tobiko_config=$1
# Write flavor ID
local flavor_name=${TOBIKO_NOVA_FLAVOR:-}
if [ "${flavor_name}" != "" ]; then
local flavor_id=$(openstack flavor show -f value -c id "${flavor_name}")
else
local flavor_id=$(openstack flavor list --limit 1 -f value -c ID --public)
fi
iniset "${tobiko_config}" nova flavor "${flavor_id}"
# Write key_file
local key_file=${TOBIKO_NOVA_KEY_FILE:-}
if ! [ -r "${key_file}" ]; then

1
devstack/settings
View File

@ -34,7 +34,6 @@ TOBIKO_KEYSTONE_TRUST_ID=${TOBIKO_KEYSTONE_TRUST_ID:-}
TOBIKO_KEYSTONE_USER_ROLE=${TOBIKO_KEYSTONE_USER_ROLE:-admin}
# --- Nova settings ---
TOBIKO_NOVA_FLAVOR=${TOBIKO_NOVA_FLAVOR:-${DEFAULT_INSTANCE_TYPE}}
TOBIKO_NOVA_KEY_FILE=${TOBIKO_NOVA_KEY_FILE:-~/.ssh/id_rsa}
# --- Neutron settings ---