Merge "Deprecate option min_l3_agents_per_router"

This commit is contained in:
Jenkins 2016-07-10 14:03:50 +00:00 committed by Gerrit Code Review
commit f7292d4914
2 changed files with 12 additions and 2 deletions

View File

@ -64,8 +64,13 @@ L3_HA_OPTS = [
"be scheduled on every agent.")),
cfg.IntOpt('min_l3_agents_per_router',
default=n_const.DEFAULT_MINIMUM_AGENTS_FOR_HA,
help=_("Minimum number of L3 agents that have to be available "
"in order to allow a new HA router to be scheduled.")),
help=_("DEPRECATED: Minimum number of L3 agents that have to "
"be available in order to allow a new HA router to be "
"scheduled. This option is deprecated in the Newton "
"release and will be removed for the Ocata release "
"where the scheduling of new HA routers will always "
"be allowed."),
deprecated_for_removal=True),
cfg.StrOpt('l3_ha_net_cidr',
default=n_const.L3_HA_NET_CIDR,
help=_('Subnet used for the l3 HA admin network.')),

View File

@ -0,0 +1,5 @@
---
deprecations:
- The option min_l3_agents_per_router is deprecated and will be
removed for the Ocata release where the scheduling of new HA
routers will always be allowed.