fixed merge conflict

1 files changed, 6 insertions, 9 deletions

diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index 41e1937c1..f4c0eaed6 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -17,9 +17,10 @@
 #    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
@@ -36,13 +37,9 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 gettext.install('nova', unicode=1)
 
 from nova import service
-from nova import twistd
 from nova import utils
 
-
 if __name__ == '__main__':
     utils.default_flagfile()
-    twistd.serve(__file__)
-
-if __name__ == '__builtin__':
-    application = service.Service.create()
+    service.serve()
+    service.wait()