From 84c47d9a5ae84da70496bcaddac894e35f031769 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 1 May 2020 19:13:09 +0900
Subject: [PATCH] Cleanup deprecated [swift]max_retries

Change-Id: I5892ce11ce9ebd6eae513da492eaef9a5e7db694
---
 ironic_inspector/conf/swift.py                                | 3 ---
 .../notes/swift-max-retries-removal-8f3c117240448760.yaml     | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/swift-max-retries-removal-8f3c117240448760.yaml

diff --git a/ironic_inspector/conf/swift.py b/ironic_inspector/conf/swift.py
index 581a763ff..d2e81ae80 100644
--- a/ironic_inspector/conf/swift.py
+++ b/ironic_inspector/conf/swift.py
@@ -22,9 +22,6 @@ SERVICE_TYPE = 'object-store'
 
 
 _OPTS = [
-    cfg.IntOpt('max_retries',
-               help=_('This option is deprecated and has no effect.'),
-               deprecated_for_removal=True),
     cfg.IntOpt('delete_after',
                default=0,
                help=_('Number of seconds that the Swift object will last '
diff --git a/releasenotes/notes/swift-max-retries-removal-8f3c117240448760.yaml b/releasenotes/notes/swift-max-retries-removal-8f3c117240448760.yaml
new file mode 100644
index 000000000..dfa4de021
--- /dev/null
+++ b/releasenotes/notes/swift-max-retries-removal-8f3c117240448760.yaml
@@ -0,0 +1,4 @@
+---
+deprecations:
+  - |
+    The deprecated ``[swift]max_retries`` parameter has been removed.