From e82494f9cd07706f086b036a15cf7bf1e141074a Mon Sep 17 00:00:00 2001
From: Jens Rosenboom <j.rosenboom@x-ion.de>
Date: Wed, 6 Jul 2016 11:49:19 +0200
Subject: [PATCH] Deprecate option min_l3_agents_per_router

As was discussed in [1], we should not only allow setting
min_l3_agents_per_router to one [2], but deprecate this option
completely.

[1] https://bugs.launchpad.net/bugs/1555042
[2] https://review.openstack.org/289925

Related-Bug: 1555042
Closes-Bug: 1599275
Change-Id: I518e12edd4bfb7a036b278d5f108cf0fc3de0353
---
 neutron/db/l3_hamode_db.py                               | 9 +++++++--
 ...recate-min-l3-agents-per-router-15ddaa4c178b23df.yaml | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/deprecate-min-l3-agents-per-router-15ddaa4c178b23df.yaml

diff --git a/neutron/db/l3_hamode_db.py b/neutron/db/l3_hamode_db.py
index e6824fb1510..701789669e9 100644
--- a/neutron/db/l3_hamode_db.py
+++ b/neutron/db/l3_hamode_db.py
@@ -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.')),
diff --git a/releasenotes/notes/deprecate-min-l3-agents-per-router-15ddaa4c178b23df.yaml b/releasenotes/notes/deprecate-min-l3-agents-per-router-15ddaa4c178b23df.yaml
new file mode 100644
index 00000000000..48af1a44bfb
--- /dev/null
+++ b/releasenotes/notes/deprecate-min-l3-agents-per-router-15ddaa4c178b23df.yaml
@@ -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.