diff --git a/lib/neutron b/lib/neutron index b857e3120d..9f9b132377 100644 --- a/lib/neutron +++ b/lib/neutron @@ -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" diff --git a/lib/neutron-legacy b/lib/neutron-legacy index 2e8992de61..bee032a704 100644 --- a/lib/neutron-legacy +++ b/lib/neutron-legacy @@ -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"