From 6e87a8419aedbfb7e0cf948cd5cc23c3f5f527f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Kub=C4=9Bna?= Date: Mon, 27 Jun 2016 11:48:31 +0200 Subject: [PATCH] Do not put real hostname and IP address to manila config sample For the moment, building manila configuration sample, we get real hostname and IP address of host that runs "genconfig" tox job. It should not be exposed. So, hide it using "sample_default" arg for appropriate options. TrivialFix Change-Id: Id8e5bdbc352229cf6a908a545e23ce62fd162ca4 --- manila/common/config.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manila/common/config.py b/manila/common/config.py index 231595e82a..f8ab91f3ec 100644 --- a/manila/common/config.py +++ b/manila/common/config.py @@ -60,6 +60,7 @@ CONF.register_cli_opts(debug_opts) global_opts = [ cfg.StrOpt('my_ip', default=netutils.get_my_ipv4(), + sample_default='', help='IP address of this host.'), cfg.StrOpt('scheduler_topic', default='manila-scheduler', @@ -118,6 +119,7 @@ global_opts = [ help='Full class name for the data manager.'), cfg.StrOpt('host', default=socket.gethostname(), + sample_default='', help='Name of this node. This can be an opaque identifier. ' 'It is not necessarily a hostname, FQDN, or IP address.'), # NOTE(vish): default to nova for compatibility with nova installs