openstack/manila
Code Issues Proposed changes

Merge "Do not put real hostname and IP address to manila config sample"

Browse Source
This commit is contained in:
Jenkins
2016-07-15 18:40:54 +00:00
committed by Gerrit Code Review
parent 2c1cfc3a07 6e87a8419a
commit 8bfeedd4d1
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manila/common/config.py
View File

@@ -60,6 +60,7 @@ CONF.register_cli_opts(debug_opts)
global_opts = [ global_opts = [
cfg.StrOpt('my_ip', cfg.StrOpt('my_ip',
default=netutils.get_my_ipv4(), default=netutils.get_my_ipv4(),
sample_default='<your_ip>',
help='IP address of this host.'), help='IP address of this host.'),
cfg.StrOpt('scheduler_topic', cfg.StrOpt('scheduler_topic',
default='manila-scheduler', default='manila-scheduler',
@@ -118,6 +119,7 @@ global_opts = [
help='Full class name for the data manager.'), help='Full class name for the data manager.'),
cfg.StrOpt('host', cfg.StrOpt('host',
default=socket.gethostname(), default=socket.gethostname(),
sample_default='<your_hostname>',
help='Name of this node. This can be an opaque identifier. ' help='Name of this node. This can be an opaque identifier. '
'It is not necessarily a hostname, FQDN, or IP address.'), 'It is not necessarily a hostname, FQDN, or IP address.'),
# NOTE(vish): default to nova for compatibility with nova installs # NOTE(vish): default to nova for compatibility with nova installs