From 67bf3b83f6e945ecd38c7ac11c26367052500f8b Mon Sep 17 00:00:00 2001 From: Maciej Szankin Date: Fri, 3 Mar 2017 10:51:56 -0600 Subject: [PATCH] conf: fix default values reporting infra worker Default values set for console_host and xenserver.console_public_hostname are reporting the details of the infra worker or some python code,, thus making it unclear what the real default value should be. Change-Id: Iba7bf16ba30958d9c4008cc2fbf77cd9f64cf5a3 Closes-Bug: 1669847 Implements: blueprint centralize-config-options-pike --- nova/conf/compute.py | 2 +- nova/conf/xenserver.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nova/conf/compute.py b/nova/conf/compute.py index 1af8abf0d8b5..0abf33c84a54 100644 --- a/nova/conf/compute.py +++ b/nova/conf/compute.py @@ -476,7 +476,7 @@ Possible values: compute_manager_opts = [ cfg.StrOpt('console_host', default=socket.gethostname(), - sample_default="socket.gethostname()", + sample_default="", help=""" Console proxy host to be used to connect to instances on this host. It is the publicly visible name for the console host. diff --git a/nova/conf/xenserver.py b/nova/conf/xenserver.py index 90b517164363..ab6f4c0aacc4 100644 --- a/nova/conf/xenserver.py +++ b/nova/conf/xenserver.py @@ -648,13 +648,14 @@ that adding new host will fail, thus option to force join was introduced. xenapi_console_opts = [ cfg.StrOpt('console_public_hostname', default=socket.gethostname(), + sample_default='', deprecated_group='DEFAULT', help=""" Publicly visible name for this console host. Possible values: -* A string representing a valid hostname +* Current hostname (default) or any string representing hostname. """), ]