From e7da2e541ea98f5e1638d44966e82a1635e2a69e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 21 Sep 2022 12:38:24 +0900
Subject: [PATCH] Undercloud: Deprecate unused scheduler_max_attempts

The option was used to tune behavior of nova-scheduler but has had no
effect since nova was removed from undercloud.

Change-Id: Ie01f4663b944a12c8ef11addf95b6b3574cb5ee7
---
 ...eprecate-uc-scheduler_max_attempts-9018c4635507940b.yaml | 6 ++++++
 tripleoclient/config/undercloud.py                          | 4 ++++
 tripleoclient/v1/undercloud_config.py                       | 1 -
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/deprecate-uc-scheduler_max_attempts-9018c4635507940b.yaml

diff --git a/releasenotes/notes/deprecate-uc-scheduler_max_attempts-9018c4635507940b.yaml b/releasenotes/notes/deprecate-uc-scheduler_max_attempts-9018c4635507940b.yaml
new file mode 100644
index 000000000..9e5c74cdb
--- /dev/null
+++ b/releasenotes/notes/deprecate-uc-scheduler_max_attempts-9018c4635507940b.yaml
@@ -0,0 +1,6 @@
+---
+deprecations:
+  - |
+    The ``[DEFAULT] scheduler_max_attempts`` option of undercloud.conf has been
+    deprecated. The option has had no effect since nova was removed from
+    undercloud.
diff --git a/tripleoclient/config/undercloud.py b/tripleoclient/config/undercloud.py
index b88dcc09f..eee07c154 100644
--- a/tripleoclient/config/undercloud.py
+++ b/tripleoclient/config/undercloud.py
@@ -287,6 +287,10 @@ class UndercloudConfig(StandaloneConfig):
                         ),
             cfg.IntOpt('scheduler_max_attempts',
                        default=30, min=1,
+                       deprecated_for_removal=True,
+                       deprecated_reason=_(
+                            'This option has no effect since nova was removed '
+                            'from undercloud.'),
                        help=_(
                            'Maximum number of attempts the scheduler will '
                            'make when deploying the instance. You should keep '
diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py
index 86d885dbc..cd4667ab1 100644
--- a/tripleoclient/v1/undercloud_config.py
+++ b/tripleoclient/v1/undercloud_config.py
@@ -64,7 +64,6 @@ PARAMETER_MAPPING = {
     'undercloud_debug': 'Debug',
     'certificate_generation_ca': 'CertmongerCA',
     'undercloud_public_host': 'CloudName',
-    'scheduler_max_attempts': 'NovaSchedulerMaxAttempts',
     'local_mtu': 'UndercloudLocalMtu',
     'clean_nodes': 'IronicAutomatedClean',
     'container_healthcheck_disabled': 'ContainerHealthcheckDisabled',