openstack
/
nova
Code Issues Proposed changes

Merge "conf: fix default values reporting infra worker"

This commit is contained in:
Jenkins 2017-03-20 16:19:49 +00:00 committed by Gerrit Code Review
parent efdc75fcb9 67bf3b83f6
commit 83df38ef4a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/conf/compute.py
View File

@ -477,7 +477,7 @@ Possible values:
compute_manager_opts = [ compute_manager_opts = [
cfg.StrOpt('console_host', cfg.StrOpt('console_host',
default=socket.gethostname(), default=socket.gethostname(),
sample_default="socket.gethostname()", sample_default="<current_hostname>",
help=""" help="""
Console proxy host to be used to connect to instances on this host. It is the Console proxy host to be used to connect to instances on this host. It is the
publicly visible name for the console host. publicly visible name for the console host.

3
nova/conf/xenserver.py
View File

@ -648,13 +648,14 @@ that adding new host will fail, thus option to force join was introduced.
xenapi_console_opts = [ xenapi_console_opts = [
cfg.StrOpt('console_public_hostname', cfg.StrOpt('console_public_hostname',
default=socket.gethostname(), default=socket.gethostname(),
sample_default='<current_hostname>',
deprecated_group='DEFAULT', deprecated_group='DEFAULT',
help=""" help="""
Publicly visible name for this console host. Publicly visible name for this console host.
Possible values: Possible values:
* A string representing a valid hostname * Current hostname (default) or any string representing hostname.
"""), """),
] ]