From: Bertrand Lallau Date: Mon, 20 Jul 2015 13:12:49 +0000 (+0200) Subject: Fix a property comment in metadata_agent files X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b70bf5c1fed674b1121fe0bf336c17a67f8d2057;p=openstack-build%2Fneutron-build.git Fix a property comment in metadata_agent files Metadata Proxy UNIX domain socket mode allows 4 values not 3. Change-Id: I83787856acda48608e1f0997329a92876afed613 --- diff --git a/etc/metadata_agent.ini b/etc/metadata_agent.ini index ca31c7fe9..e436069e5 100644 --- a/etc/metadata_agent.ini +++ b/etc/metadata_agent.ini @@ -45,7 +45,7 @@ admin_password = %SERVICE_PASSWORD% # Location of Metadata Proxy UNIX domain socket # metadata_proxy_socket = $state_path/metadata_proxy -# Metadata Proxy UNIX domain socket mode, 3 values allowed: +# Metadata Proxy UNIX domain socket mode, 4 values allowed: # 'deduce': deduce mode from metadata_proxy_user/group values, # 'user': set metadata proxy socket mode to 0o644, to use when # metadata_proxy_user is agent effective user or root, diff --git a/neutron/agent/metadata/config.py b/neutron/agent/metadata/config.py index 2a5706e8e..8a89dc38e 100644 --- a/neutron/agent/metadata/config.py +++ b/neutron/agent/metadata/config.py @@ -109,7 +109,7 @@ UNIX_DOMAIN_METADATA_PROXY_OPTS = [ cfg.StrOpt('metadata_proxy_socket_mode', default=DEDUCE_MODE, choices=SOCKET_MODES, - help=_("Metadata Proxy UNIX domain socket mode, 3 values " + help=_("Metadata Proxy UNIX domain socket mode, 4 values " "allowed: " "'deduce': deduce mode from metadata_proxy_user/group " "values, "