From 2337fab0979b72bbc7e7730e94518a0e835a2751 Mon Sep 17 00:00:00 2001
From: Andy Smith <code@term.ie>
Date: Mon, 25 Oct 2010 03:45:19 +0900
Subject: part way through porting the codebase off of twisted

this provides a very basic eventlet-based service replacement for the
twistd-based services, a replacement for task.LoopingCall

also adds nova-combined with the goal of running a single service when
doing local testing and dev
---
 bin/nova-combined | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 bin/nova-compute  | 12 +++++------
 bin/nova-network  | 14 ++++++-------
 3 files changed, 72 insertions(+), 15 deletions(-)
 create mode 100755 bin/nova-combined

(limited to 'bin')

diff --git a/bin/nova-combined b/bin/nova-combined
new file mode 100755
index 000000000..65865acd9
--- /dev/null
+++ b/bin/nova-combined
@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""
+  Twistd daemon for the nova compute nodes.
+"""
+
+import eventlet
+eventlet.monkey_patch()
+
+import os
+import sys
+
+from eventlet import greenthread
+
+# If ../nova/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
+                                   os.pardir))
+if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
+    sys.path.insert(0, possible_topdir)
+
+from nova import api
+from nova import flags
+from nova import service_eventlet
+from nova import wsgi
+
+
+FLAGS = flags.FLAGS
+flags.DEFINE_integer('api_port', 8773, 'API port')
+
+
+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')
+
+    service_eventlet.serve(compute, network, volume, scheduler)
+    wsgi.run_server(api.API(), FLAGS.api_port)
+    
diff --git a/bin/nova-compute b/bin/nova-compute
index 1724e9659..600fbb897 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -21,6 +21,9 @@
   Twistd daemon for the nova compute nodes.
 """
 
+import eventlet
+eventlet.monkey_patch()
+
 import os
 import sys
 
@@ -32,12 +35,7 @@ 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 service_eventlet
 
 if __name__ == '__main__':
-    twistd.serve(__file__)
-
-if __name__ == '__builtin__':
-    application = service.Service.create()  # pylint: disable=C0103
+    service_eventlet.serve()
diff --git a/bin/nova-network b/bin/nova-network
index fa88aeb47..600fbb897 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -18,9 +18,12 @@
 #    under the License.
 
 """
-  Twistd daemon for the nova network nodes.
+  Twistd daemon for the nova compute nodes.
 """
 
+import eventlet
+eventlet.monkey_patch()
+
 import os
 import sys
 
@@ -32,12 +35,7 @@ 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 service_eventlet
 
 if __name__ == '__main__':
-    twistd.serve(__file__)
-
-if __name__ == '__builtin__':
-    application = service.Service.create()  # pylint: disable-msg=C0103
+    service_eventlet.serve()
-- 
cgit 


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-compute         | 3 ++-
 bin/nova-instancemonitor | 2 +-
 bin/nova-network         | 2 +-
 bin/nova-objectstore     | 2 +-
 bin/nova-scheduler       | 2 +-
 bin/nova-volume          | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'bin')

diff --git a/bin/nova-compute b/bin/nova-compute
index a66477af5..1054852c4 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -38,8 +38,9 @@ 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=C0103
+
diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor
index a7b7fb0c6..9b6c40e82 100755
--- a/bin/nova-instancemonitor
+++ b/bin/nova-instancemonitor
@@ -42,10 +42,10 @@ logging.getLogger('boto').setLevel(logging.WARN)
 
 
 if __name__ == '__main__':
+    utils.default_flagfile()
     twistd.serve(__file__)
 
 if __name__ == '__builtin__':
-    utils.default_flagfile()
     logging.warn('Starting instance monitor')
     # pylint: disable-msg=C0103
     monitor = monitor.InstanceMonitor()
diff --git a/bin/nova-network b/bin/nova-network
index 342a63058..d1fb55261 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -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
diff --git a/bin/nova-objectstore b/bin/nova-objectstore
index 728f2ee5b..00ae27af9 100755
--- a/bin/nova-objectstore
+++ b/bin/nova-objectstore
@@ -42,8 +42,8 @@ FLAGS = flags.FLAGS
 
 
 if __name__ == '__main__':
+    utils.default_flagfile()
     twistd.serve(__file__)
 
 if __name__ == '__builtin__':
-    utils.default_flagfile()
     application = handler.get_application()  # pylint: disable-msg=C0103
diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index 069b5a6fa..4d1a40cf1 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -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()
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 6e6b5325bfc5233b243ed9f8279694136d605ddf Mon Sep 17 00:00:00 2001
From: Michael Gundlach <michael.gundlach@rackspace.com>
Date: Wed, 1 Dec 2010 11:43:20 -0600
Subject: Removed a blank line.

---
 bin/nova-compute | 1 -
 1 file changed, 1 deletion(-)

(limited to 'bin')

diff --git a/bin/nova-compute b/bin/nova-compute
index 1054852c4..ac6378f75 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -43,4 +43,3 @@ if __name__ == '__main__':
 
 if __name__ == '__builtin__':
     application = service.Service.create()  # pylint: disable=C0103
-
-- 
cgit 


From 1e050bb4a8eeb65a7ac25a9fb90493567b5b07f4 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Thu, 2 Dec 2010 15:18:45 +0100
Subject: Add a helpful error message to nova-manage in case of NoMoreNetworks.

This is one of the most common problems people have, and the solution
is not currently easily discoverable. This should address that.
---
 bin/nova-manage | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index eb7c6b87b..62eec8353 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -359,9 +359,14 @@ class ProjectCommands(object):
     def zipfile(self, project_id, user_id, filename='nova.zip'):
         """Exports credentials for project to a zip file
         arguments: project_id user_id [filename='nova.zip]"""
-        zip_file = self.manager.get_credentials(user_id, project_id)
-        with open(filename, 'w') as f:
-            f.write(zip_file)
+        try:
+            zip_file = self.manager.get_credentials(user_id, project_id)
+            with open(filename, 'w') as f:
+                f.write(zip_file)
+        except db.api.NoMoreNetworks:
+            print ('No more networks available. If this is a new '
+                   'installation, you need\nto call something like this:\n\n'
+                   '    nova-manage network create 10.0.0.0/8 10 64\n\n')
 
 
 class FloatingIpCommands(object):
-- 
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-api       | 10 +++++-----
 bin/nova-combined  | 14 +++++++++++---
 bin/nova-compute   |  1 +
 bin/nova-network   |  1 +
 bin/nova-scheduler | 15 ++++++---------
 bin/nova-volume    | 15 ++++++---------
 6 files changed, 30 insertions(+), 26 deletions(-)

(limited to 'bin')

diff --git a/bin/nova-api b/bin/nova-api
index a9c53dbcd..3215ad5ef 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -32,9 +32,11 @@ 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 api
 from nova import flags
 from nova import utils
 from nova import server
+from nova import wsgi
 
 FLAGS = flags.FLAGS
 flags.DEFINE_integer('osapi_port', 8774, 'OpenStack API port')
@@ -43,9 +45,8 @@ flags.DEFINE_integer('ec2api_port', 8773, 'EC2 API port')
 flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host')
 
 
-def main(_args):
-    from nova import api
-    from nova import wsgi
+def main():
+    FLAGS(sys.argv)
     server = wsgi.Server()
     server.start(api.API('os'), FLAGS.osapi_port, host=FLAGS.osapi_host)
     server.start(api.API('ec2'), FLAGS.ec2api_port, host=FLAGS.ec2api_host)
@@ -53,5 +54,4 @@ def main(_args):
 
 
 if __name__ == '__main__':
-    utils.default_flagfile()
-    server.serve('nova-api', main)
+    main()
diff --git a/bin/nova-combined b/bin/nova-combined
index 65865acd9..c86584328 100755
--- a/bin/nova-combined
+++ b/bin/nova-combined
@@ -27,8 +27,6 @@ eventlet.monkey_patch()
 import os
 import sys
 
-from eventlet import greenthread
-
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
@@ -46,6 +44,12 @@ from nova import wsgi
 FLAGS = flags.FLAGS
 flags.DEFINE_integer('api_port', 8773, 'API port')
 
+FLAGS = flags.FLAGS
+flags.DEFINE_integer('osapi_port', 8774, 'OpenStack API port')
+flags.DEFINE_string('osapi_host', '0.0.0.0', 'OpenStack API host')
+flags.DEFINE_integer('ec2api_port', 8773, 'EC2 API port')
+flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host')
+
 
 if __name__ == '__main__':
     FLAGS(sys.argv)
@@ -57,5 +61,9 @@ if __name__ == '__main__':
     #objectstore = service_eventlet.Service.create(binary='nova-objectstore')
 
     service_eventlet.serve(compute, network, volume, scheduler)
-    wsgi.run_server(api.API(), FLAGS.api_port)
+
+    server = wsgi.Server()
+    server.start(api.API('os'), FLAGS.osapi_port, host=FLAGS.osapi_host)
+    server.start(api.API('ec2'), FLAGS.ec2api_port, host=FLAGS.ec2api_host)
+    server.wait()
     
diff --git a/bin/nova-compute b/bin/nova-compute
index 600fbb897..307f7cb59 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -39,3 +39,4 @@ from nova import service_eventlet
 
 if __name__ == '__main__':
     service_eventlet.serve()
+    service_eventlet.wait()
diff --git a/bin/nova-network b/bin/nova-network
index 600fbb897..307f7cb59 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -39,3 +39,4 @@ from nova import service_eventlet
 
 if __name__ == '__main__':
     service_eventlet.serve()
+    service_eventlet.wait()
diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index 4d1a40cf1..e4aa0dcae 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -21,6 +21,9 @@
   Twistd daemon for the nova scheduler 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()
+    service_eventlet.serve()
+    service_eventlet.wait()
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-combined  | 14 +++++++-------
 bin/nova-compute   |  6 +++---
 bin/nova-network   |  6 +++---
 bin/nova-scheduler |  6 +++---
 bin/nova-volume    |  6 +++---
 5 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'bin')

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()
-- 
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-api       | 6 ++----
 bin/nova-combined  | 4 +---
 bin/nova-compute   | 4 +---
 bin/nova-network   | 4 +---
 bin/nova-scheduler | 4 +---
 bin/nova-volume    | 4 +---
 6 files changed, 7 insertions(+), 19 deletions(-)

(limited to 'bin')

diff --git a/bin/nova-api b/bin/nova-api
index 3215ad5ef..3505cefe7 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -17,9 +17,8 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
-"""
-Nova API daemon.
-"""
+
+"""Starter script for Nova API."""
 
 import os
 import sys
@@ -35,7 +34,6 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 from nova import api
 from nova import flags
 from nova import utils
-from nova import server
 from nova import wsgi
 
 FLAGS = flags.FLAGS
diff --git a/bin/nova-combined b/bin/nova-combined
index c70d1d9ef..964ffd438 100755
--- a/bin/nova-combined
+++ b/bin/nova-combined
@@ -17,9 +17,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-"""
-  Twistd daemon for the nova compute nodes.
-"""
+"""Combined starter script for Nova services."""
 
 import eventlet
 eventlet.monkey_patch()
diff --git a/bin/nova-compute b/bin/nova-compute
index 4baf47e29..f224f0690 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -17,9 +17,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-"""
-  Twistd daemon for the nova compute nodes.
-"""
+"""Starter script for Nova Compute."""
 
 import eventlet
 eventlet.monkey_patch()
diff --git a/bin/nova-network b/bin/nova-network
index 4baf47e29..589c75e5a 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -17,9 +17,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-"""
-  Twistd daemon for the nova compute nodes.
-"""
+"""Starter script for Nova Network."""
 
 import eventlet
 eventlet.monkey_patch()
diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index a1b7ddf60..cb345aa3f 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -17,9 +17,7 @@
 #    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()
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-api       | 1 +
 bin/nova-combined  | 2 ++
 bin/nova-compute   | 2 ++
 bin/nova-network   | 2 ++
 bin/nova-scheduler | 2 ++
 bin/nova-volume    | 2 ++
 6 files changed, 11 insertions(+)

(limited to 'bin')

diff --git a/bin/nova-api b/bin/nova-api
index 3505cefe7..210486666 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -52,4 +52,5 @@ def main():
 
 
 if __name__ == '__main__':
+    utils.default_flagfile()
     main()
diff --git a/bin/nova-combined b/bin/nova-combined
index 964ffd438..e82b9c9b6 100755
--- a/bin/nova-combined
+++ b/bin/nova-combined
@@ -36,6 +36,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
+from nova import utils
 from nova import wsgi
 
 
@@ -50,6 +51,7 @@ flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host')
 
 
 if __name__ == '__main__':
+    utils.default_flagfile()
     FLAGS(sys.argv)
     
     compute = service.Service.create(binary='nova-compute')
diff --git a/bin/nova-compute b/bin/nova-compute
index f224f0690..8b02cd0f5 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -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()
diff --git a/bin/nova-network b/bin/nova-network
index 589c75e5a..01cc9d00d 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -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()
diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index cb345aa3f..a46dd8dda 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -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()
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 a6645d8a431ed933eef4ea6c42c0224ead6f2272 Mon Sep 17 00:00:00 2001
From: "jaypipes@gmail.com" <>
Date: Sat, 11 Dec 2010 15:10:24 -0500
Subject: Initial i18n commit for endpoints. All endpoints must install
 gettext, which injects the _ function into the builtins.

---
 bin/nova-api        | 3 +++
 bin/nova-compute    | 3 +++
 bin/nova-dhcpbridge | 3 +++
 3 files changed, 9 insertions(+)

(limited to 'bin')

diff --git a/bin/nova-api b/bin/nova-api
index a9c53dbcd..2ae6a099a 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -21,6 +21,7 @@
 Nova API daemon.
 """
 
+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 flags
 from nova import utils
 from nova import server
diff --git a/bin/nova-compute b/bin/nova-compute
index ac6378f75..f57b68584 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -21,6 +21,7 @@
   Twistd daemon for the nova compute 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
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index 17c62da0a..81b9b6dd3 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -21,6 +21,7 @@
 Handle lease database updates from DHCP servers.
 """
 
+import gettext
 import logging
 import os
 import sys
@@ -33,6 +34,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 context
 from nova import db
 from nova import flags
-- 
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-import-canonical-imagestore | 3 +++
 bin/nova-instancemonitor             | 3 +++
 bin/nova-manage                      | 3 +++
 bin/nova-network                     | 3 +++
 bin/nova-objectstore                 | 3 +++
 bin/nova-scheduler                   | 3 +++
 bin/nova-volume                      | 3 +++
 7 files changed, 21 insertions(+)

(limited to 'bin')

diff --git a/bin/nova-import-canonical-imagestore b/bin/nova-import-canonical-imagestore
index 4ed9e8365..036b41e48 100755
--- a/bin/nova-import-canonical-imagestore
+++ b/bin/nova-import-canonical-imagestore
@@ -21,6 +21,7 @@
   Download images from Canonical Image Store
 """
 
+import gettext
 import json
 import os
 import tempfile
@@ -37,6 +38,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 flags
 from nova import utils
 from nova.objectstore import image
diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor
index 9b6c40e82..5dac3ffe6 100755
--- a/bin/nova-instancemonitor
+++ b/bin/nova-instancemonitor
@@ -21,6 +21,7 @@
   Daemon for Nova RRD based instance resource monitoring.
 """
 
+import gettext
 import os
 import logging
 import sys
@@ -34,6 +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)
 
+gettext.install('nova', unicode=1)
+
 from nova import utils
 from nova import twistd
 from nova.compute import monitor
diff --git a/bin/nova-manage b/bin/nova-manage
index 62eec8353..0c1b621ed 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -53,6 +53,7 @@
   CLI interface for nova management.
 """
 
+import gettext
 import logging
 import os
 import sys
@@ -68,6 +69,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 context
 from nova import db
 from nova import exception
diff --git a/bin/nova-network b/bin/nova-network
index d1fb55261..86d04c723 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -21,6 +21,7 @@
   Twistd daemon for the nova network 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
diff --git a/bin/nova-objectstore b/bin/nova-objectstore
index 00ae27af9..9fbe228a2 100755
--- a/bin/nova-objectstore
+++ b/bin/nova-objectstore
@@ -21,6 +21,7 @@
   Twisted daemon for nova objectstore. Supports S3 API.
 """
 
+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 flags
 from nova import utils
 from nova import twistd
diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index 4d1a40cf1..41e1937c1 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -21,6 +21,7 @@
   Twistd daemon for the nova scheduler 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
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 


From a2a8406b5d793545c8ecb359e18b80bba618c509 Mon Sep 17 00:00:00 2001
From: termie <code@term.ie>
Date: Tue, 14 Dec 2010 16:05:39 -0800
Subject: updates per review

---
 bin/nova-api       | 9 +++------
 bin/nova-combined  | 3 ---
 bin/nova-scheduler | 2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'bin')

diff --git a/bin/nova-api b/bin/nova-api
index 210486666..3f433ea6d 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -36,6 +36,7 @@ from nova import flags
 from nova import utils
 from nova import wsgi
 
+
 FLAGS = flags.FLAGS
 flags.DEFINE_integer('osapi_port', 8774, 'OpenStack API port')
 flags.DEFINE_string('osapi_host', '0.0.0.0', 'OpenStack API host')
@@ -43,14 +44,10 @@ flags.DEFINE_integer('ec2api_port', 8773, 'EC2 API port')
 flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host')
 
 
-def main():
+if __name__ == '__main__':
+    utils.default_flagfile()
     FLAGS(sys.argv)
     server = wsgi.Server()
     server.start(api.API('os'), FLAGS.osapi_port, host=FLAGS.osapi_host)
     server.start(api.API('ec2'), FLAGS.ec2api_port, host=FLAGS.ec2api_host)
     server.wait()
-
-
-if __name__ == '__main__':
-    utils.default_flagfile()
-    main()
diff --git a/bin/nova-combined b/bin/nova-combined
index e82b9c9b6..5f635b3a3 100755
--- a/bin/nova-combined
+++ b/bin/nova-combined
@@ -40,9 +40,6 @@ from nova import utils
 from nova import wsgi
 
 
-FLAGS = flags.FLAGS
-flags.DEFINE_integer('api_port', 8773, 'API port')
-
 FLAGS = flags.FLAGS
 flags.DEFINE_integer('osapi_port', 8774, 'OpenStack API port')
 flags.DEFINE_string('osapi_host', '0.0.0.0', 'OpenStack API host')
diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index a46dd8dda..59cb060d4 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -17,7 +17,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-""" Starter script for Nova Scheduler."""
+"""Starter script for Nova Scheduler."""
 
 import eventlet
 eventlet.monkey_patch()
-- 
cgit 


From e306d236e3cf91c00a36940e277ad2d105b055a1 Mon Sep 17 00:00:00 2001
From: termie <code@term.ie>
Date: Thu, 16 Dec 2010 12:45:06 -0800
Subject: pep8 fixes for bin

---
 bin/nova-combined | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/nova-combined b/bin/nova-combined
index 5f635b3a3..c6a04f7e9 100755
--- a/bin/nova-combined
+++ b/bin/nova-combined
@@ -50,7 +50,7 @@ flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host')
 if __name__ == '__main__':
     utils.default_flagfile()
     FLAGS(sys.argv)
-    
+
     compute = service.Service.create(binary='nova-compute')
     network = service.Service.create(binary='nova-network')
     volume = service.Service.create(binary='nova-volume')
@@ -63,4 +63,3 @@ if __name__ == '__main__':
     server.start(api.API('os'), FLAGS.osapi_port, host=FLAGS.osapi_host)
     server.start(api.API('ec2'), FLAGS.ec2api_port, host=FLAGS.ec2api_host)
     server.wait()
-    
-- 
cgit