summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-07-22 07:51:03 -0500
committerVishvananda Ishaya <vishvananda@gmail.com>2010-07-22 07:51:03 -0500
commitb03f05a0eb321350297e2f86a05ec4593bfc4049 (patch)
treed1ae42b3237a4f191fe11f2ac8a8f50f1605c51f
parent80d03bbeb1f1acb82c495747dcf5cc9390df025a (diff)
downloadnova-b03f05a0eb321350297e2f86a05ec4593bfc4049.tar.gz
nova-b03f05a0eb321350297e2f86a05ec4593bfc4049.tar.xz
nova-b03f05a0eb321350297e2f86a05ec4593bfc4049.zip
typo fixes and extra print statements removed
-rwxr-xr-xbin/nova-compute4
-rwxr-xr-xbin/nova-network4
-rwxr-xr-xbin/nova-volume4
-rw-r--r--nova/twistd.py2
4 files changed, 6 insertions, 8 deletions
diff --git a/bin/nova-compute b/bin/nova-compute
index 67c93fcb8..1d5fa709d 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -22,11 +22,11 @@
"""
from nova import twistd
-from nova.compute import node
+from nova.compute import computenode
if __name__ == '__main__':
twistd.serve(__file__)
if __name__ == '__builtin__':
- application = node.ComputeNode.create()
+ application = computenode.ComputeNode.create()
diff --git a/bin/nova-network b/bin/nova-network
index c69690081..db9d4b970 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -22,11 +22,11 @@
"""
from nova import twistd
-from nova.network import node
+from nova.network import networknode
if __name__ == '__main__':
twistd.serve(__file__)
if __name__ == '__builtin__':
- application = node.NetworkNode.create()
+ application = networknode.NetworkNode.create()
diff --git a/bin/nova-volume b/bin/nova-volume
index cdf2782bc..2e9b530a7 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -22,11 +22,11 @@
"""
from nova import twistd
-from nova.volume import node
+from nova.volume import volumenode
if __name__ == '__main__':
twistd.serve(__file__)
if __name__ == '__builtin__':
- application = node.VolumeNode.create()
+ application = volumenode.VolumeNode.create()
diff --git a/nova/twistd.py b/nova/twistd.py
index fc7dad26a..909b23590 100644
--- a/nova/twistd.py
+++ b/nova/twistd.py
@@ -216,12 +216,10 @@ def serve(filename):
elif FLAGS.pidfile.endswith('twistd.pid'):
FLAGS.pidfile = FLAGS.pidfile.replace('twistd.pid', '%s.pid' % name)
- print FLAGS.logfile
if not FLAGS.logfile:
FLAGS.logfile = '%s.log' % name
elif FLAGS.logfile.endswith('twistd.log'):
FLAGS.logfile = FLAGS.logfile.replace('twistd.log', '%s.log' % name)
- print FLAGS.logfile
action = 'start'
if len(argv) > 1: