openstack/nova
Code Issues Proposed changes

more cleanup of binaries per review

Browse Source
This commit is contained in:
Vishvananda Ishaya
2011-08-18 10:55:39 -07:00
parent 6cdee85905
commit 125a2affec
10 changed files with 36 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/nova-ajax-console-proxy
View File

@@ -24,7 +24,6 @@ from eventlet import greenthread
from eventlet.green import urllib2 from eventlet.green import urllib2
import exceptions import exceptions
import gettext
import os import os
import sys import sys
import time import time
@@ -38,11 +37,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')): if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
sys.path.insert(0, possible_topdir) sys.path.insert(0, possible_topdir)
gettext.install('nova', unicode=1)
from nova import flags from nova import flags
from nova import log as logging from nova import log as logging
from nova import rpc from nova import rpc
from nova import service
from nova import utils from nova import utils
from nova import wsgi from nova import wsgi
@@ -141,5 +140,5 @@ if __name__ == '__main__':
acp = AjaxConsoleProxy() acp = AjaxConsoleProxy()
acp.register_listeners() acp.register_listeners()
server = wsgi.Server("AJAX Console Proxy", acp, port=acp_port) server = wsgi.Server("AJAX Console Proxy", acp, port=acp_port)
server.start() service.serve(server)
server.wait() service.wait()

8
bin/nova-api
View File

@@ -26,7 +26,6 @@ Starts both the EC2 and OpenStack APIs in separate greenthreads.
import eventlet import eventlet
eventlet.monkey_patch() eventlet.monkey_patch()
import gettext
import os import os
import sys import sys
@@ -36,7 +35,6 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(
if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")): if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
sys.path.insert(0, possible_topdir) sys.path.insert(0, possible_topdir)
gettext.install('nova', unicode=1)
from nova import flags from nova import flags
from nova import log as logging from nova import log as logging
@@ -47,8 +45,8 @@ if __name__ == '__main__':
utils.default_flagfile() utils.default_flagfile()
flags.FLAGS(sys.argv) flags.FLAGS(sys.argv)
logging.setup() logging.setup()
services = [] servers = []
for api in flags.FLAGS.enabled_apis: for api in flags.FLAGS.enabled_apis:
services.append(service.WSGIService(api)) servers.append(service.WSGIService(api))
service.serve(*services) service.serve(*servers)
service.wait() service.wait()

5
bin/nova-compute
View File

@@ -22,7 +22,6 @@
import eventlet import eventlet
eventlet.monkey_patch() eventlet.monkey_patch()
import gettext
import os import os
import sys import sys
@@ -34,7 +33,6 @@ 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')): if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):
sys.path.insert(0, POSSIBLE_TOPDIR) sys.path.insert(0, POSSIBLE_TOPDIR)
gettext.install('nova', unicode=1)
from nova import flags from nova import flags
from nova import log as logging from nova import log as logging
@@ -45,5 +43,6 @@ if __name__ == '__main__':
utils.default_flagfile() utils.default_flagfile()
flags.FLAGS(sys.argv) flags.FLAGS(sys.argv)
logging.setup() logging.setup()
service.serve() server = service.Server(binary='nova-compute')
service.serve(server)
service.wait() service.wait()

5
bin/nova-console
View File

@@ -21,7 +21,6 @@
import eventlet import eventlet
eventlet.monkey_patch() eventlet.monkey_patch()
import gettext
import os import os
import sys import sys
@@ -33,7 +32,6 @@ 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')): if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
sys.path.insert(0, possible_topdir) sys.path.insert(0, possible_topdir)
gettext.install('nova', unicode=1)
from nova import flags from nova import flags
from nova import log as logging from nova import log as logging
@@ -44,5 +42,6 @@ if __name__ == '__main__':
utils.default_flagfile() utils.default_flagfile()
flags.FLAGS(sys.argv) flags.FLAGS(sys.argv)
logging.setup() logging.setup()
service.serve() server = service.Server(binary='nova-console')
service.serve(server)
service.wait() service.wait()

11
bin/nova-direct-api
View File

@@ -20,7 +20,9 @@
"""Starter script for Nova Direct API.""" """Starter script for Nova Direct API."""
import gettext import eventlet
eventlet.monkey_patch()
import os import os
import sys import sys
@@ -32,12 +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')): if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
sys.path.insert(0, possible_topdir) sys.path.insert(0, possible_topdir)
gettext.install('nova', unicode=1)
from nova import compute from nova import compute
from nova import flags from nova import flags
from nova import log as logging from nova import log as logging
from nova import network from nova import network
from nova import service
from nova import utils from nova import utils
from nova import volume from nova import volume
from nova import wsgi from nova import wsgi
@@ -97,5 +99,6 @@ if __name__ == '__main__':
with_auth, with_auth,
host=FLAGS.direct_host, host=FLAGS.direct_host,
port=FLAGS.direct_port) port=FLAGS.direct_port)
server.start()
server.wait() service.serve(server)
service.wait()

5
bin/nova-network
View File

@@ -22,7 +22,6 @@
import eventlet import eventlet
eventlet.monkey_patch() eventlet.monkey_patch()
import gettext
import os import os
import sys import sys
@@ -34,7 +33,6 @@ 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')): if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
sys.path.insert(0, possible_topdir) sys.path.insert(0, possible_topdir)
gettext.install('nova', unicode=1)
from nova import flags from nova import flags
from nova import log as logging from nova import log as logging
@@ -45,5 +43,6 @@ if __name__ == '__main__':
utils.default_flagfile() utils.default_flagfile()
flags.FLAGS(sys.argv) flags.FLAGS(sys.argv)
logging.setup() logging.setup()
service.serve() server = service.Server(binary='nova-compute')
service.serve(server)
service.wait() service.wait()

14
bin/nova-objectstore
View File

@@ -17,11 +17,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
""" """Daemon for nova objectstore. Supports S3 API."""
Daemon for nova objectstore. Supports S3 API.
""" import eventlet
eventlet.monkey_patch()
import gettext
import os import os
import sys import sys
@@ -33,10 +33,10 @@ 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')): if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
sys.path.insert(0, possible_topdir) sys.path.insert(0, possible_topdir)
gettext.install('nova', unicode=1)
from nova import flags from nova import flags
from nova import log as logging from nova import log as logging
from nova import service
from nova import utils from nova import utils
from nova import wsgi from nova import wsgi
from nova.objectstore import s3server from nova.objectstore import s3server
@@ -54,5 +54,5 @@ if __name__ == '__main__':
router, router,
port=FLAGS.s3_port, port=FLAGS.s3_port,
host=FLAGS.s3_host) host=FLAGS.s3_host)
server.start() service.serve(server)
server.wait() service.wait()

5
bin/nova-scheduler
View File

@@ -22,7 +22,6 @@
import eventlet import eventlet
eventlet.monkey_patch() eventlet.monkey_patch()
import gettext
import os import os
import sys import sys
@@ -34,7 +33,6 @@ 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')): if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
sys.path.insert(0, possible_topdir) sys.path.insert(0, possible_topdir)
gettext.install('nova', unicode=1)
from nova import flags from nova import flags
from nova import log as logging from nova import log as logging
@@ -45,5 +43,6 @@ if __name__ == '__main__':
utils.default_flagfile() utils.default_flagfile()
flags.FLAGS(sys.argv) flags.FLAGS(sys.argv)
logging.setup() logging.setup()
service.serve() server = service.Server(binary='nova-compute')
service.serve(server)
service.wait() service.wait()

15
bin/nova-vncproxy
View File

@@ -19,7 +19,8 @@
"""VNC Console Proxy Server.""" """VNC Console Proxy Server."""
import eventlet import eventlet
import gettext eventlet.monkey_patch()
import os import os
import sys import sys
@@ -29,7 +30,6 @@ 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')): if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
sys.path.insert(0, possible_topdir) sys.path.insert(0, possible_topdir)
gettext.install('nova', unicode=1)
from nova import flags from nova import flags
from nova import log as logging from nova import log as logging
@@ -41,7 +41,7 @@ from nova.vnc import auth
from nova.vnc import proxy from nova.vnc import proxy
LOG = logging.getLogger('nova.vnc-proxy') LOG = logging.getLogger('nova.vncproxy')
FLAGS = flags.FLAGS FLAGS = flags.FLAGS
@@ -81,7 +81,7 @@ if __name__ == "__main__":
FLAGS(sys.argv) FLAGS(sys.argv)
logging.setup() logging.setup()
LOG.audit(_("Starting nova-vnc-proxy node (version %s)"), LOG.audit(_("Starting nova-vncproxy node (version %s)"),
version.version_string_with_vcs()) version.version_string_with_vcs())
if not (os.path.exists(FLAGS.vncproxy_wwwroot) and if not (os.path.exists(FLAGS.vncproxy_wwwroot) and
@@ -107,13 +107,10 @@ if __name__ == "__main__":
else: else:
with_auth = auth.VNCNovaAuthMiddleware(with_logging) with_auth = auth.VNCNovaAuthMiddleware(with_logging)
service.serve()
server = wsgi.Server("VNC Proxy", server = wsgi.Server("VNC Proxy",
with_auth, with_auth,
host=FLAGS.vncproxy_host, host=FLAGS.vncproxy_host,
port=FLAGS.vncproxy_port) port=FLAGS.vncproxy_port)
server.start()
server.start_tcp(handle_flash_socket_policy, 843, host=FLAGS.vncproxy_host) server.start_tcp(handle_flash_socket_policy, 843, host=FLAGS.vncproxy_host)
service.serve(server)
server.wait() service.wait()

5
bin/nova-volume
View File

@@ -22,7 +22,6 @@
import eventlet import eventlet
eventlet.monkey_patch() eventlet.monkey_patch()
import gettext
import os import os
import sys import sys
@@ -34,7 +33,6 @@ 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')): if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
sys.path.insert(0, possible_topdir) sys.path.insert(0, possible_topdir)
gettext.install('nova', unicode=1)
from nova import flags from nova import flags
from nova import log as logging from nova import log as logging
@@ -45,5 +43,6 @@ if __name__ == '__main__':
utils.default_flagfile() utils.default_flagfile()
flags.FLAGS(sys.argv) flags.FLAGS(sys.argv)
logging.setup() logging.setup()
service.serve() server = service.Server(binary='nova-volume')
service.serve(server)
service.wait() service.wait()