openstack/deb-nova
Code Issues Proposed changes

move flags per termie's feedback

Browse Source
This commit is contained in:
Anthony Young
2011-03-29 13:47:47 -07:00
parent dbef492039
commit cc7ba9a7a4
4 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nova/flags.py
View File

@@ -281,16 +281,6 @@ DEFINE_string('ajax_console_proxy_url',
in the form "http://127.0.0.1:8000"') in the form "http://127.0.0.1:8000"')
DEFINE_string('ajax_console_proxy_port', DEFINE_string('ajax_console_proxy_port',
8000, 'port that ajax_console_proxy binds') 8000, 'port that ajax_console_proxy binds')
DEFINE_string('vncproxy_topic', 'vncproxy',
'the topic vnc proxy nodes listen on')
DEFINE_string('vncproxy_url',
'http://127.0.0.1:6080',
'location of vnc console proxy, \
in the form "http://127.0.0.1:6080"')
DEFINE_string('vncserver_host', '0.0.0.0',
'the host interface on which vnc server should listen')
DEFINE_bool('vnc_enabled', True,
'enable vnc related features')
DEFINE_bool('verbose', False, 'show debug output') DEFINE_bool('verbose', False, 'show debug output')
DEFINE_boolean('fake_rabbit', False, 'use a fake rabbit') DEFINE_boolean('fake_rabbit', False, 'use a fake rabbit')
DEFINE_bool('fake_network', False, DEFINE_bool('fake_network', False,

1
nova/virt/libvirt_conn.py
View File

@@ -57,6 +57,7 @@ from nova import flags
from nova import log as logging from nova import log as logging
#from nova import test #from nova import test
from nova import utils from nova import utils
from nova import vnc
from nova.auth import manager from nova.auth import manager
from nova.compute import instance_types from nova.compute import instance_types
from nova.compute import power_state from nova.compute import power_state

35
nova/vnc/__init__.py
View File

@@ -0,0 +1,35 @@
#!/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.
"""Module for VNC Proxying."""
from nova import flags
FLAGS = flags.FLAGS
flags.DEFINE_string('vncproxy_topic', 'vncproxy',
'the topic vnc proxy nodes listen on')
flags.DEFINE_string('vncproxy_url',
'http://127.0.0.1:6080',
'location of vnc console proxy, \
in the form "http://127.0.0.1:6080"')
flags.DEFINE_string('vncserver_host', '0.0.0.0',
'the host interface on which vnc server should listen')
flags.DEFINE_bool('vnc_enabled', True,
'enable vnc related features')

3
nova/vnc/auth.py
View File

@@ -89,8 +89,9 @@ class VNCNovaAuthMiddleware(object):
del self.token_cache[k] del self.token_cache[k]
class LoggingMiddleware(object): class LoggingMiddleware(object):
"""Middleware for basic vnc-specific request logging."""
def __init__(self, app): def __init__(self, app):
self.app = app self.app = app