openstack/nova
Code Issues Proposed changes

Merge "config options: improve help for noVNC"

Browse Source
This commit is contained in:
Jenkins 2016-07-25 16:25:21 +00:00 committed by Gerrit Code Review
commit a08a94a04d
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nova/conf/novnc.py
View File

@ -24,28 +24,31 @@ from oslo_config import cfg
novnc_opts = [ novnc_opts = [
cfg.StrOpt('record', cfg.StrOpt('record',
help='This is the filename that will be used for storing ' help="""
'websocket frames received and sent by a proxy service ' Filename that will be used for storing websocket frames received
'(like VNC, spice, serial) running on this host. If this ' and sent by a proxy service (like VNC, spice, serial) running on this host.
'is not set (default), no recording will be done.'), If this is not set, no recording will be done.
"""),
cfg.BoolOpt('daemon', cfg.BoolOpt('daemon',
default=False, default=False,
help='Become a daemon (background process)'), help="Run as a background process."),
cfg.BoolOpt('ssl_only', cfg.BoolOpt('ssl_only',
default=False, default=False,
help='Disallow non-encrypted connections'), help="Disallow non-encrypted connections."),
cfg.BoolOpt('source_is_ipv6', cfg.BoolOpt('source_is_ipv6',
default=False, default=False,
help='Source is ipv6'), help="Set to True if source host is addressed with IPv6."),
cfg.StrOpt('cert', cfg.StrOpt('cert',
default='self.pem', default='self.pem',
help='SSL certificate file'), help="Path to SSL certificate file."),
cfg.StrOpt('key', cfg.StrOpt('key',
help='SSL key file (if separate from cert)'), help="SSL key file (if separate from cert)."),
cfg.StrOpt('web', cfg.StrOpt('web',
default='/usr/share/spice-html5', default='/usr/share/spice-html5',
help='Run webserver on same port. Serve files from DIR.'), help="""
] Path to directory with content which will be served by a web server.
"""),
]
def register_opts(conf): def register_opts(conf):