Skip to content

Commit e638593

Browse files
committed
Make configure_neutron_nova_new and create_nova_conf_neutron param optional
The commit e95f2a3 broke networking-ovn (and potentially other ml2 drivers) by making the config parameter mandatory. It doesn't need to be. Change-Id: I0d5738ac3a6d27ddb7655835d77689409a6ff6f4
1 parent 282145a commit e638593

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

lib/neutron

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,10 @@ function configure_neutron_rootwrap {
325325
}
326326

327327
# Make Neutron-required changes to nova.conf
328-
# Takes a single argument which is the config file to update.
328+
# Takes a single optional argument which is the config file to update,
329+
# if not passed $NOVA_CONF is used.
329330
function configure_neutron_nova_new {
330-
local conf="$1"
331+
local conf=${1:-$NOVA_CONF}
331332
iniset $conf DEFAULT use_neutron True
332333
iniset $conf neutron auth_type "password"
333334
iniset $conf neutron auth_url "$KEYSTONE_SERVICE_URI"

lib/neutron-legacy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ function configure_mutnauq {
366366
}
367367

368368
function create_nova_conf_neutron {
369-
local conf="$1"
369+
local conf=${1:-$NOVA_CONF}
370370
iniset $conf DEFAULT use_neutron True
371371
iniset $conf neutron auth_type "password"
372372
iniset $conf neutron auth_url "$KEYSTONE_AUTH_URI"

0 commit comments

Comments
 (0)