merged trunk, fixed conflicts and tests

1 files changed, 9 insertions, 9 deletions

diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index 069b5a6fa..f4c0eaed6 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -17,10 +17,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-"""
-  Twistd daemon for the nova scheduler nodes.
-"""
+"""Starter script for Nova Scheduler."""
 
+import eventlet
+eventlet.monkey_patch()
+
+import gettext
 import os
 import sys
 
@@ -32,14 +34,12 @@ 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
 
-
 if __name__ == '__main__':
-    twistd.serve(__file__)
-
-if __name__ == '__builtin__':
     utils.default_flagfile()
-    application = service.Service.create()
+    service.serve()
+    service.wait()