From 874ec0691f57f58b690004cb246ce066604f0ba3 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sun, 5 May 2024 15:47:44 +0900
Subject: [PATCH] Remove deprecated [health_manager] health_update_driver

The option was deprecated in Victoria release[1] and has had no effect
since then.

Also remove the deprecated [health_manager] stats_update_driver option
which was renamed by the same commit.

[1] 5092597f6b78bc3f02812cd425aa9d95e9501be7

Change-Id: I690428bae49dc594eacae08d40612e4d1f7523a1
---
 octavia/common/config.py                               | 10 ----------
 .../remove-health_update_driver-56c99ec977bca245.yaml  |  9 +++++++++
 2 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 releasenotes/notes/remove-health_update_driver-56c99ec977bca245.yaml

diff --git a/octavia/common/config.py b/octavia/common/config.py
index 5fde9bd416..9693d04cbf 100644
--- a/octavia/common/config.py
+++ b/octavia/common/config.py
@@ -317,13 +317,6 @@ health_manager_opts = [
                default=10,
                mutable=True,
                help=_('Sleep time between sending heartbeats.')),
-
-    # Used for updating health
-    cfg.StrOpt('health_update_driver', default='health_db',
-               help=_('Driver for updating amphora health system.'),
-               deprecated_for_removal=True,
-               deprecated_reason=_('This driver interface was removed.'),
-               deprecated_since='Victoria'),
 ]
 
 oslo_messaging_opts = [
@@ -507,9 +500,6 @@ controller_worker_opts = [
                default='distributor_noop_driver',
                help=_('Name of the distributor driver to use')),
     cfg.ListOpt('statistics_drivers', default=['stats_db'],
-                deprecated_name='stats_update_driver',
-                deprecated_group='health_manager',
-                deprecated_since='Victoria',
                 help=_('List of drivers for updating amphora statistics.')),
     cfg.StrOpt('loadbalancer_topology',
                default=constants.TOPOLOGY_SINGLE,
diff --git a/releasenotes/notes/remove-health_update_driver-56c99ec977bca245.yaml b/releasenotes/notes/remove-health_update_driver-56c99ec977bca245.yaml
new file mode 100644
index 0000000000..d14cc83fb1
--- /dev/null
+++ b/releasenotes/notes/remove-health_update_driver-56c99ec977bca245.yaml
@@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    The deprecated ``[health_manager] health_update_driver`` option was
+    removed.
+
+  - |
+    The deprecated ``[health_manager] stats_update_driver`` option has been
+    removed. Use the ``[controller_worker] statistics_drivers`` option instead.