From 11dddd7ca4f4264ef3a8f1e251601c1d8fd7a626 Mon Sep 17 00:00:00 2001
From: Michael Gundlach <michael.gundlach@rackspace.com>
Date: Wed, 1 Dec 2010 10:44:51 -0600
Subject: Move default_flagfile() call to where it will be parsed in time to
 load the flagfile

---
 bin/nova-volume | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/nova-volume')

diff --git a/bin/nova-volume b/bin/nova-volume
index 26148b0ec..e7281d6c0 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -38,8 +38,8 @@ from nova import utils
 
 
 if __name__ == '__main__':
+    utils.default_flagfile()
     twistd.serve(__file__)
 
 if __name__ == '__builtin__':
-    utils.default_flagfile()
     application = service.Service.create()  # pylint: disable-msg=C0103
-- 
cgit 


From 00f329d479564ad8349ed32a27990da2ed3a396e Mon Sep 17 00:00:00 2001
From: Andy Smith <code@term.ie>
Date: Thu, 9 Dec 2010 14:36:23 -0800
Subject: make nova binaries use eventlet

---
 bin/nova-volume | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'bin/nova-volume')

diff --git a/bin/nova-volume b/bin/nova-volume
index e7281d6c0..395d16041 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -21,6 +21,9 @@
   Twistd daemon for the nova volume nodes.
 """
 
+import eventlet
+eventlet.monkey_patch()
+
 import os
 import sys
 
@@ -32,14 +35,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-from nova import service
-from nova import twistd
-from nova import utils
-
+from nova import service_eventlet
 
 if __name__ == '__main__':
-    utils.default_flagfile()
-    twistd.serve(__file__)
-
-if __name__ == '__builtin__':
-    application = service.Service.create()  # pylint: disable-msg=C0103
+    service_eventlet.serve()
+    service_eventlet.wait()
-- 
cgit 


From b3f5aba0c465b263c1d0a15c7d249dafb3a98e6c Mon Sep 17 00:00:00 2001
From: Andy Smith <code@term.ie>
Date: Thu, 9 Dec 2010 15:25:14 -0800
Subject: remove service and rename service_eventlet to service

---
 bin/nova-volume | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'bin/nova-volume')

diff --git a/bin/nova-volume b/bin/nova-volume
index 395d16041..ba4a3a502 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -35,8 +35,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-from nova import service_eventlet
+from nova import service
 
 if __name__ == '__main__':
-    service_eventlet.serve()
-    service_eventlet.wait()
+    service.serve()
+    service.wait()
-- 
cgit 


From a1640f352806ee12f6b485a8d69a65bd42b51411 Mon Sep 17 00:00:00 2001
From: Andy Smith <code@term.ie>
Date: Thu, 9 Dec 2010 16:05:13 -0800
Subject: formatting and naming cleanup

---
 bin/nova-volume | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'bin/nova-volume')

diff --git a/bin/nova-volume b/bin/nova-volume
index ba4a3a502..2f74f4b9a 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -17,9 +17,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-"""
-  Twistd daemon for the nova volume nodes.
-"""
+"""Starter script for Nova Volume."""
 
 import eventlet
 eventlet.monkey_patch()
-- 
cgit 


From 4d06429290a373ae3a42b1f9b58d7253d269e048 Mon Sep 17 00:00:00 2001
From: Andy Smith <code@term.ie>
Date: Thu, 9 Dec 2010 16:45:51 -0800
Subject: add back utils.default_flagflie

---
 bin/nova-volume | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bin/nova-volume')

diff --git a/bin/nova-volume b/bin/nova-volume
index 2f74f4b9a..efb837ba2 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -34,7 +34,9 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
 from nova import service
+from nova import utils
 
 if __name__ == '__main__':
+    utils.default_flagfile()
     service.serve()
     service.wait()
-- 
cgit 


From 797e3f8a1cc72599aa8540b5655e29da8975e56f Mon Sep 17 00:00:00 2001
From: "jaypipes@gmail.com" <>
Date: Tue, 14 Dec 2010 18:22:03 -0500
Subject: For some reason, I forgot to commit the other endpoints...

---
 bin/nova-volume | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bin/nova-volume')

diff --git a/bin/nova-volume b/bin/nova-volume
index e7281d6c0..4f2e96268 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -21,6 +21,7 @@
   Twistd daemon for the nova volume nodes.
 """
 
+import gettext
 import os
 import sys
 
@@ -32,6 +33,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
+gettext.install('nova', unicode=1)
+
 from nova import service
 from nova import twistd
 from nova import utils
-- 
cgit