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

diff --git a/etc/neutron.conf b/etc/neutron.conf
index 623456c310bb118348bfbe41e54e9362189a6269..ea5792ddf87baa9196b8651c6a95fb0a6f287a4d 100644 (file)
--- 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 12281b96b1c0cb407104a8bc5869eade1a12412c..5d29cedbe5b60fdcc83aff79e614aebad6afbcc5 100644 (file)
--- 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 "