From f9ff151549bfa57cfeec524cf06ae3d65c8ab0a8 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 16 Jan 2020 10:52:52 +0000 Subject: [PATCH] Stop configuring '[DEFAULT] use_neutron' for nova This has now been removed and even prior to removal defaulted to True. Change-Id: I847a873d833a4dbee96afa1d2726fea2b8045eeb Signed-off-by: Stephen Finucane --- lib/neutron | 1 - lib/neutron-legacy | 1 - 2 files changed, 2 deletions(-) diff --git a/lib/neutron b/lib/neutron index a86d83e170..9e6a80cf08 100644 --- a/lib/neutron +++ b/lib/neutron @@ -354,7 +354,6 @@ function configure_neutron_rootwrap { # if not passed $NOVA_CONF is used. function configure_neutron_nova_new { local conf=${1:-$NOVA_CONF} - iniset $conf DEFAULT use_neutron True iniset $conf neutron auth_type "password" iniset $conf neutron auth_url "$KEYSTONE_SERVICE_URI" iniset $conf neutron username neutron diff --git a/lib/neutron-legacy b/lib/neutron-legacy index f0bdcf1da7..3d39d41b7e 100644 --- a/lib/neutron-legacy +++ b/lib/neutron-legacy @@ -373,7 +373,6 @@ function configure_mutnauq { function create_nova_conf_neutron { local conf=${1:-$NOVA_CONF} - iniset $conf DEFAULT use_neutron True iniset $conf neutron auth_type "password" iniset $conf neutron auth_url "$KEYSTONE_AUTH_URI" iniset $conf neutron username "$Q_ADMIN_USERNAME"