From 00473e02bfdd71c15fd1206a96860e2b728b092a Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Fri, 5 Jul 2019 10:35:49 +0200
Subject: [PATCH] Remove configuration of flavor in DevStack plugin

Change-Id: I30a348edfbac86ffd51de8434ed19cbe4320ab9e
---
 devstack/plugin.sh | 9 ---------
 devstack/settings  | 1 -
 2 files changed, 10 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index d17aaee9d..4432a07aa 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -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
diff --git a/devstack/settings b/devstack/settings
index 28f779df1..ed348b237 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -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 ---