diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-19 18:07:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-19 18:07:34 +0000 |
| commit | cbf9d897384b22b45f253fa78c1dd08d13f6a2e8 (patch) | |
| tree | 3e38f01f142e716afeb6a0d3c5afe1ed8f5380db | |
| parent | 51e34aa44d4c67eb326c0ec57f1cd4d32e46438a (diff) | |
| parent | 59140ba482eca5a1fb5280e1f34c6597bd7ae14a (diff) | |
| download | nova-cbf9d897384b22b45f253fa78c1dd08d13f6a2e8.tar.gz nova-cbf9d897384b22b45f253fa78c1dd08d13f6a2e8.tar.xz nova-cbf9d897384b22b45f253fa78c1dd08d13f6a2e8.zip | |
Merge "Make load_network_driver load passed in driver."
| -rw-r--r-- | nova/network/driver.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/network/driver.py b/nova/network/driver.py index 4caff4575..2a9218898 100644 --- a/nova/network/driver.py +++ b/nova/network/driver.py @@ -39,6 +39,6 @@ def load_network_driver(network_driver=None): LOG.error(_("Network driver option required, but not specified")) sys.exit(1) - LOG.info(_("Loading network driver '%s'") % CONF.network_driver) + LOG.info(_("Loading network driver '%s'") % network_driver) - return importutils.import_module(CONF.network_driver) + return importutils.import_module(network_driver) |