diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-all | 8 | ||||
| -rwxr-xr-x | bin/nova-consoleauth | 48 | ||||
| -rwxr-xr-x | bin/nova-xvpvncproxy (renamed from bin/nova-vncproxy) | 9 |
3 files changed, 53 insertions, 12 deletions
diff --git a/bin/nova-all b/bin/nova-all index 497195bda..9c9e2bbaa 100755 --- a/bin/nova-all +++ b/bin/nova-all @@ -44,7 +44,6 @@ from nova import flags from nova import log as logging from nova import service from nova import utils -from nova.vnc import server from nova.objectstore import s3server @@ -60,17 +59,12 @@ if __name__ == '__main__': servers.append(service.WSGIService(api)) except (Exception, SystemExit): logging.exception(_('Failed to load %s') % '%s-api' % api) - # nova-vncproxy - try: - servers.append(server.get_wsgi_server()) - except (Exception, SystemExit): - logging.exception(_('Failed to load %s') % 'vncproxy-wsgi') # nova-objectstore try: servers.append(s3server.get_wsgi_server()) except (Exception, SystemExit): logging.exception(_('Failed to load %s') % 'objectstore-wsgi') - for binary in ['nova-vncproxy', 'nova-compute', 'nova-volume', + for binary in ['nova-xvpvncproxy', 'nova-compute', 'nova-volume', 'nova-network', 'nova-scheduler', 'nova-vsa']: try: servers.append(service.Service.create(binary=binary)) diff --git a/bin/nova-consoleauth b/bin/nova-consoleauth new file mode 100755 index 000000000..325a399d7 --- /dev/null +++ b/bin/nova-consoleauth @@ -0,0 +1,48 @@ +#!/usr/bin/env python +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright (c) 2012 Openstack, LLC. +# 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. + +"""VNC Console Proxy Server.""" + +import eventlet +eventlet.monkey_patch() + +import os +import sys + +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 flags +from nova import log as logging +from nova import service +from nova import utils +from nova.consoleauth import manager + + +if __name__ == "__main__": + utils.default_flagfile() + flags.FLAGS(sys.argv) + logging.setup() + + server = service.Service.create(binary='nova-consoleauth') + service.serve(server) + service.wait() diff --git a/bin/nova-vncproxy b/bin/nova-xvpvncproxy index 9b44a95ea..a17d0cbb3 100755 --- a/bin/nova-vncproxy +++ b/bin/nova-xvpvncproxy @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""VNC Console Proxy Server.""" +"""XVP VNC Console Proxy Server.""" import eventlet eventlet.monkey_patch() @@ -35,7 +35,7 @@ from nova import flags from nova import log as logging from nova import service from nova import utils -from nova.vnc import server +from nova.vnc import xvp_proxy if __name__ == "__main__": @@ -43,7 +43,6 @@ if __name__ == "__main__": flags.FLAGS(sys.argv) logging.setup() - wsgi_server = server.get_wsgi_server() - server = service.Service.create(binary='nova-vncproxy') - service.serve(wsgi_server, server) + wsgi_server = xvp_proxy.get_wsgi_server() + service.serve(wsgi_server) service.wait() |