summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorEwan Mellor <ewan.mellor@citrix.com>2010-07-18 18:02:04 +0100
committerEwan Mellor <ewan.mellor@citrix.com>2010-07-18 18:02:04 +0100
commitd5309eff30b1a826f075b28935de2a4b89eede6e (patch)
tree01aa485d9718f7fd9205f52b586c1ed4d24d9e25 /nova
parentb09e69c5579526fcc1a08c7e3c3a3c880fa09297 (diff)
Fixed references to nova.utils that were broken by a change of import
statement in the remove-vendor merge.
Diffstat (limited to 'nova')
-rw-r--r--nova/compute/linux_net.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/linux_net.py b/nova/compute/linux_net.py
index 7b6ae693a..00c64d81a 100644
--- a/nova/compute/linux_net.py
+++ b/nova/compute/linux_net.py
@@ -33,13 +33,13 @@ def execute(cmd):
logging.debug("FAKE NET: %s" % cmd)
return "fake", 0
else:
- return nova.utils.execute(cmd)
+ return utils.execute(cmd)
def runthis(desc, cmd):
if FLAGS.fake_network:
return execute(cmd)
else:
- return nova.utils.runthis(desc,cmd)
+ return utils.runthis(desc,cmd)
def Popen(cmd):
if FLAGS.fake_network: