summaryrefslogtreecommitdiffstats
path: root/bin/nova-vncproxy
diff options
context:
space:
mode:
authorAnthony Young <sleepsonthefloor@gmail.com>2011-12-22 21:39:21 +0000
committerAnthony Young <sleepsonthefloor@gmail.com>2012-01-17 14:18:31 -0800
commit8d010cacb520786fa12794801bc31eddd23b2af7 (patch)
tree51609a7c80b6a62128a9819fadb0064209e17a81 /bin/nova-vncproxy
parent5987ed97ffb90e52acb7a7d9e0a915d072aadaed (diff)
downloadnova-8d010cacb520786fa12794801bc31eddd23b2af7.tar.gz
nova-8d010cacb520786fa12794801bc31eddd23b2af7.tar.xz
nova-8d010cacb520786fa12794801bc31eddd23b2af7.zip
Implements blueprint vnc-console-cleanup
* Creates a unified way to access vnc consoles for xenserver and libvirt * Now supports both java and websocket clients * Removes nova-vncproxy - a replacement version of this (nova-novncproxy) can be found as described in vncconsole.rst * Adds nova-xvpvncproxy, which supports a java vnc client * Adds api extension to access java and novnc access_urls * Fixes proxy server to close/shutdown sockets more cleanly * Address style feedback * Use new-style extension format * Fix setup.py * utils.gen_uuid must be wrapped like str(utils.gen_uuid()) or it can't be serialized Change-Id: I5e42e2f160e8e3476269bd64b0e8aa77e66c918c
Diffstat (limited to 'bin/nova-vncproxy')
-rwxr-xr-xbin/nova-vncproxy49
1 files changed, 0 insertions, 49 deletions
diff --git a/bin/nova-vncproxy b/bin/nova-vncproxy
deleted file mode 100755
index 9b44a95ea..000000000
--- a/bin/nova-vncproxy
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2010 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.vnc import server
-
-
-if __name__ == "__main__":
- utils.default_flagfile()
- flags.FLAGS(sys.argv)
- logging.setup()
-
- wsgi_server = server.get_wsgi_server()
- server = service.Service.create(binary='nova-vncproxy')
- service.serve(wsgi_server, server)
- service.wait()