summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2012-12-19 10:26:48 -0500
committerDan Prince <dprince@redhat.com>2012-12-19 10:26:48 -0500
commit59140ba482eca5a1fb5280e1f34c6597bd7ae14a (patch)
treed44803c86e4d71fb2a7f6b246f8f779dd7bf4d04
parent0e17114aacbb6fb71477629ca8d0a1992d9ea119 (diff)
downloadnova-59140ba482eca5a1fb5280e1f34c6597bd7ae14a.tar.gz
nova-59140ba482eca5a1fb5280e1f34c6597bd7ae14a.tar.xz
nova-59140ba482eca5a1fb5280e1f34c6597bd7ae14a.zip
Make load_network_driver load passed in driver.
Small fix to the load_network_driver function so that it loads the driver we pass in as a variable rather than always using CONF.network_driver. Change-Id: I9afbbd87bde07ad9d425512dce37b54fd5e3b21e
-rw-r--r--nova/network/driver.py4
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)