openstack
/
neutron
Code Issues Proposed changes

Merge "Add help text for 'host' parameter in neutron.conf file"

This commit is contained in:
Jenkins 2015-01-06 11:38:41 +00:00 committed by Gerrit Code Review
parent 6e42c4c926 d50595d5fa
commit 41d7fa4012
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etc/neutron.conf
View File

@ -75,6 +75,13 @@ lock_path = $state_path/lock
# Paste configuration file
# api_paste_config = api-paste.ini
# (StrOpt) Hostname to be used by the neutron server, agents and services
# running on this machine. All the agents and services running on this machine
# must use the same host value.
# The default value is hostname of the machine.
#
# host =
# The strategy to be used for auth.
# Supported values are 'keystone'(default), 'noauth'.
# auth_strategy = keystone

5
neutron/common/config.py
View File

@ -79,7 +79,10 @@ core_opts = [
cfg.BoolOpt('allow_overlapping_ips', default=False,
help=_("Allow overlapping IP support in Neutron")),
cfg.StrOpt('host', default=utils.get_hostname(),
help=_("The hostname Neutron is running on")),
help=_("Hostname to be used by the neutron server, agents and"
"services running on this machine. All the agents and "
"services running on this machine must use the same "
"host value.")),
cfg.BoolOpt('force_gateway_on_subnet', default=True,
help=_("Ensure that configured gateway is on subnet. "
"For IPv6, validate only if gateway is not a link "