From: Li Ma Date: Mon, 13 Apr 2015 05:29:56 +0000 (-0700) Subject: Provide details for configure multiple DHCP agents X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8be4e4d5fc052655f7a968fc5016c84aca48758e;p=openstack-build%2Fneutron-build.git Provide details for configure multiple DHCP agents The help text is not that good for operation. This fix adds more information about the option 'dhcp_agents_per_network'. Change-Id: I955c1e9989a9c65b0ffdbbdca9113c795ec72fe6 Closes-Bug: #1370934 --- diff --git a/etc/neutron.conf b/etc/neutron.conf index 5d8640f90..35e2a7401 100644 --- a/etc/neutron.conf +++ b/etc/neutron.conf @@ -215,8 +215,10 @@ # Networks could then be rescheduled if network_auto_schedule is True # allow_automatic_dhcp_failover = True -# Number of DHCP agents scheduled to host a network. This enables redundant -# DHCP agents for configured networks. +# Number of DHCP agents scheduled to host a tenant network. +# If this number is greater than 1, the scheduler automatically +# assigns multiple DHCP agents for a given tenant network, +# providing high availability for DHCP service. # dhcp_agents_per_network = 1 # Enable services on agents with admin_state_up False. diff --git a/neutron/db/agentschedulers_db.py b/neutron/db/agentschedulers_db.py index 39cb3eddd..45cbe417e 100644 --- a/neutron/db/agentschedulers_db.py +++ b/neutron/db/agentschedulers_db.py @@ -48,7 +48,11 @@ AGENTS_SCHEDULER_OPTS = [ help=_('Automatically remove networks from offline DHCP ' 'agents.')), cfg.IntOpt('dhcp_agents_per_network', default=1, - help=_('Number of DHCP agents scheduled to host a network.')), + help=_('Number of DHCP agents scheduled to host a tenant ' + 'network. If this number is greater than 1, the ' + 'scheduler automatically assigns multiple DHCP agents ' + 'for a given tenant network, providing high ' + 'availability for DHCP service.')), cfg.BoolOpt('enable_services_on_agents_with_admin_state_down', default=False, help=_('Enable services on an agent with admin_state_up '