Browse code
Make configure_neutron_nova_new and create_nova_conf_neutron param optional
The commit e95f2a36645b58b172855213cb8311a3486bfcd9 broke
networking-ovn (and potentially other ml2 drivers) by making the config
parameter mandatory. It doesn't need to be.
Change-Id: I0d5738ac3a6d27ddb7655835d77689409a6ff6f4
Lucas Alvares Gomes authored on 2018/06/28 19:00:28Showing 2 changed files
| ... | ... |
@@ -325,9 +325,10 @@ function configure_neutron_rootwrap {
|
| 325 | 325 |
} |
| 326 | 326 |
|
| 327 | 327 |
# 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. |
|
| 329 | 330 |
function configure_neutron_nova_new {
|
| 330 |
- local conf="$1" |
|
| 331 |
+ local conf=${1:-$NOVA_CONF}
|
|
| 331 | 332 |
iniset $conf DEFAULT use_neutron True |
| 332 | 333 |
iniset $conf neutron auth_type "password" |
| 333 | 334 |
iniset $conf neutron auth_url "$KEYSTONE_SERVICE_URI" |
| ... | ... |
@@ -366,7 +366,7 @@ function configure_mutnauq {
|
| 366 | 366 |
} |
| 367 | 367 |
|
| 368 | 368 |
function create_nova_conf_neutron {
|
| 369 |
- local conf="$1" |
|
| 369 |
+ local conf=${1:-$NOVA_CONF}
|
|
| 370 | 370 |
iniset $conf DEFAULT use_neutron True |
| 371 | 371 |
iniset $conf neutron auth_type "password" |
| 372 | 372 |
iniset $conf neutron auth_url "$KEYSTONE_AUTH_URI" |