From d50595d5fae105e7c4cdb8a2b78302a6883e2033 Mon Sep 17 00:00:00 2001 From: Numan Siddique Date: Sun, 28 Dec 2014 17:33:57 +0530 Subject: [PATCH] Add help text for 'host' parameter in neutron.conf file This patch adds the help text for 'host' parameter in neutron.conf which is presently missing and updates the neutron/common/config.py accordingly Change-Id: Iddfc9c44b3fae95cbae1cfe1142c3d3a92749799 Closes-bug: #1406052 --- etc/neutron.conf | 7 +++++++ neutron/common/config.py | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/etc/neutron.conf b/etc/neutron.conf index 623456c310b..ea5792ddf87 100644 --- a/etc/neutron.conf +++ b/etc/neutron.conf @@ -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 diff --git a/neutron/common/config.py b/neutron/common/config.py index 12281b96b1c..5d29cedbe5b 100644 --- a/neutron/common/config.py +++ b/neutron/common/config.py @@ -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 "