Merge "Mention neutron-rootwrap-daemon in root_helper_daemon option help"

This commit is contained in:
Zuul
2018-06-04 10:41:47 +00:00
committed by Gerrit Code Review

View File

@@ -94,11 +94,19 @@ ROOT_HELPER_OPTS = [
# Having a bool use_rootwrap_daemon option precludes specifying the
# rootwrap daemon command, which may be necessary for Xen?
cfg.StrOpt('root_helper_daemon',
help=_("Root helper daemon application to use when possible. "
"For the agent which needs to execute commands in Dom0 "
"in the hypervisor of XenServer, this item should be "
"set to 'xenapi_root_helper', so that it will keep a "
"XenAPI session to pass commands to Dom0.")),
help=_("""
Root helper daemon application to use when possible.
Use 'sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf' to run rootwrap
in "daemon mode" which has been reported to improve performance at scale. For
more information on running rootwrap in "daemon mode", see:
https://docs.openstack.org/oslo.rootwrap/latest/user/usage.html#daemon-mode
For the agent which needs to execute commands in Dom0 in the hypervisor of
XenServer, this option should be set to 'xenapi_root_helper', so that it will
keep a XenAPI session to pass commands to Dom0.
""")),
]
AGENT_STATE_OPTS = [