Merge "Remove configuration of flavor in DevStack plugin"
This commit is contained in:
commit
856ca9ac05
|
@ -118,15 +118,6 @@ function configure_tobiko_nova {
|
||||||
echo_summary "Write [nova] section to ${TOBIKO_CONFIG}"
|
echo_summary "Write [nova] section to ${TOBIKO_CONFIG}"
|
||||||
local tobiko_config=$1
|
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
|
# Write key_file
|
||||||
local key_file=${TOBIKO_NOVA_KEY_FILE:-}
|
local key_file=${TOBIKO_NOVA_KEY_FILE:-}
|
||||||
if ! [ -r "${key_file}" ]; then
|
if ! [ -r "${key_file}" ]; then
|
||||||
|
|
|
@ -34,7 +34,6 @@ TOBIKO_KEYSTONE_TRUST_ID=${TOBIKO_KEYSTONE_TRUST_ID:-}
|
||||||
TOBIKO_KEYSTONE_USER_ROLE=${TOBIKO_KEYSTONE_USER_ROLE:-admin}
|
TOBIKO_KEYSTONE_USER_ROLE=${TOBIKO_KEYSTONE_USER_ROLE:-admin}
|
||||||
|
|
||||||
# --- Nova settings ---
|
# --- Nova settings ---
|
||||||
TOBIKO_NOVA_FLAVOR=${TOBIKO_NOVA_FLAVOR:-${DEFAULT_INSTANCE_TYPE}}
|
|
||||||
TOBIKO_NOVA_KEY_FILE=${TOBIKO_NOVA_KEY_FILE:-~/.ssh/id_rsa}
|
TOBIKO_NOVA_KEY_FILE=${TOBIKO_NOVA_KEY_FILE:-~/.ssh/id_rsa}
|
||||||
|
|
||||||
# --- Neutron settings ---
|
# --- Neutron settings ---
|
||||||
|
|
Loading…
Reference in New Issue