remove service and rename service_eventlet to service

5 files changed, 19 insertions, 19 deletions

diff --git a/bin/nova-combined b/bin/nova-combined
index c86584328..c70d1d9ef 100755
--- a/bin/nova-combined
+++ b/bin/nova-combined
@@ -37,7 +37,7 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 
 from nova import api
 from nova import flags
-from nova import service_eventlet
+from nova import service
 from nova import wsgi
 
 
@@ -54,13 +54,13 @@ flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host')
 if __name__ == '__main__':
     FLAGS(sys.argv)
     
-    compute = service_eventlet.Service.create(binary='nova-compute')
-    network = service_eventlet.Service.create(binary='nova-network')
-    volume = service_eventlet.Service.create(binary='nova-volume')
-    scheduler = service_eventlet.Service.create(binary='nova-scheduler')
-    #objectstore = service_eventlet.Service.create(binary='nova-objectstore')
+    compute = service.Service.create(binary='nova-compute')
+    network = service.Service.create(binary='nova-network')
+    volume = service.Service.create(binary='nova-volume')
+    scheduler = service.Service.create(binary='nova-scheduler')
+    #objectstore = service.Service.create(binary='nova-objectstore')
 
-    service_eventlet.serve(compute, network, volume, scheduler)
+    service.serve(compute, network, volume, scheduler)
 
     server = wsgi.Server()
     server.start(api.API('os'), FLAGS.osapi_port, host=FLAGS.osapi_host)
diff --git a/bin/nova-compute b/bin/nova-compute
index 307f7cb59..4baf47e29 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -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()
diff --git a/bin/nova-network b/bin/nova-network
index 307f7cb59..4baf47e29 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -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()
diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index e4aa0dcae..a1b7ddf60 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -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()
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()