Merge "Stop configuring '[DEFAULT] use_neutron' for nova"

This commit is contained in:
Zuul 2020-01-19 17:42:44 +00:00 committed by Gerrit Code Review
commit 0d3f08f692
2 changed files with 0 additions and 2 deletions

View File

@ -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

View File

@ -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"