1. devstack
  2. Commit f9ff151549bfa57cfeec524cf06ae3d65c8ab0a8
Browse code

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 <sfinucan@redhat.com>

Stephen Finucane authored on 2020/01/16 19:52:52
Showing 2 changed files
lib/neutron
History View file @ f9ff151
... ... 
@@ -354,7 +354,6 @@ function configure_neutron_rootwrap {
354 354 
 # if not passed $NOVA_CONF is used.
355 355 
 function configure_neutron_nova_new {
356 356 
     local conf=${1:-$NOVA_CONF}
357 
-    iniset $conf DEFAULT use_neutron True
358 357 
     iniset $conf neutron auth_type "password"
359 358 
     iniset $conf neutron auth_url "$KEYSTONE_SERVICE_URI"
360 359 
     iniset $conf neutron username neutron
lib/neutron-legacy
History View file @ f9ff151
... ... 
@@ -373,7 +373,6 @@ function configure_mutnauq {
373 373
374 374 
 function create_nova_conf_neutron {
375 375 
     local conf=${1:-$NOVA_CONF}
376 
-    iniset $conf DEFAULT use_neutron True
377 376 
     iniset $conf neutron auth_type "password"
378 377 
     iniset $conf neutron auth_url "$KEYSTONE_AUTH_URI"
379 378 
     iniset $conf neutron username "$Q_ADMIN_USERNAME"