openstack
/
devstack
Code Issues Proposed changes

Make configure_neutron_nova_new and create_nova_conf_neutron param optional 

The commit e95f2a3664 broke
networking-ovn (and potentially other ml2 drivers) by making the config
parameter mandatory. It doesn't need to be.

Change-Id: I0d5738ac3a6d27ddb7655835d77689409a6ff6f4
This commit is contained in:
Lucas Alvares Gomes 2018-06-28 11:00:28 +01:00
parent 282145a480
commit e638593624
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/neutron
View File

@ -325,9 +325,10 @@ function configure_neutron_rootwrap {
}
# Make Neutron-required changes to nova.conf
# Takes a single argument which is the config file to update.
# Takes a single optional argument which is the config file to update,
# if not passed $NOVA_CONF is used.
function configure_neutron_nova_new {
local conf="$1"
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"

2
lib/neutron-legacy
View File

@ -366,7 +366,7 @@ function configure_mutnauq {
}
function create_nova_conf_neutron {
local conf="$1"
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"