From 0cba8bc924ea5bd25f55540faa737678a768bf27 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 19 Aug 2021 09:51:53 +0900
Subject: [PATCH] Remove deprecated max_concurrent_builds from
 nova::compute::ironic

... because the parameter was migrated to base nova::compute during
Victoria cycle and has been deprecated since then.

Change-Id: I5abd8d7f667a4863ae9c26d3936c845585d3d896
---
 manifests/compute.pp                                 |  6 +-----
 manifests/compute/ironic.pp                          | 12 ------------
 ...ronic-max_concurrent_builds-c1ca15bb24bba255.yaml |  5 +++++
 3 files changed, 6 insertions(+), 17 deletions(-)
 create mode 100644 releasenotes/notes/remove-ironic-max_concurrent_builds-c1ca15bb24bba255.yaml

diff --git a/manifests/compute.pp b/manifests/compute.pp
index ed667cc0e..3bab7e0c2 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -382,10 +382,6 @@ class nova::compute (
 
   $image_type_exclude_list_real = pick(join(any2array($image_type_exclude_list), ','), $::os_service_default)
 
-  $max_concurrent_builds_real = pick(
-    $::nova::compute::ironic::max_concurrent_builds,
-    $max_concurrent_builds)
-
   include nova::pci
   if $pci_passthrough {
     # Note: also remove the pick from nova::compute::pci
@@ -515,7 +511,7 @@ Use the same parameter in nova::api class.')
     'DEFAULT/resize_confirm_window':             value => $resize_confirm_window;
     'DEFAULT/shutdown_timeout':                  value => $shutdown_timeout;
     'DEFAULT/resume_guests_state_on_host_boot':  value => $resume_guests_state_on_host_boot;
-    'DEFAULT/max_concurrent_builds':             value => $max_concurrent_builds_real;
+    'DEFAULT/max_concurrent_builds':             value => $max_concurrent_builds;
     'DEFAULT/max_concurrent_live_migrations':    value => $max_concurrent_live_migrations;
     'DEFAULT/sync_power_state_pool_size':        value => $sync_power_state_pool_size;
     'DEFAULT/sync_power_state_interval':         value => $sync_power_state_interval;
diff --git a/manifests/compute/ironic.pp b/manifests/compute/ironic.pp
index 88497fa72..8094ac3ca 100644
--- a/manifests/compute/ironic.pp
+++ b/manifests/compute/ironic.pp
@@ -8,14 +8,8 @@
 #   (optional) Compute driver.
 #   Defaults to 'ironic.IronicDriver'
 #
-# [*max_concurrent_builds*]
-#   (optional) Maximum number of instance builds to run concurrently
-#   Defaults to undef
-#
 class nova::compute::ironic (
   $compute_driver        = 'ironic.IronicDriver',
-  # DEPRECATED PARAMETERS
-  $max_concurrent_builds = undef,
 ) {
 
   include nova::deps
@@ -25,10 +19,4 @@ class nova::compute::ironic (
   nova_config {
     'DEFAULT/compute_driver': value => $compute_driver;
   }
-
-  if $max_concurrent_builds != undef {
-    warning('The nova::compute::ironic::max_concurrent_builds parameter is deprecated \
-and will be removed in a future release. Use nova::compute::max_concurrent_builds instead.')
-  }
-
 }
diff --git a/releasenotes/notes/remove-ironic-max_concurrent_builds-c1ca15bb24bba255.yaml b/releasenotes/notes/remove-ironic-max_concurrent_builds-c1ca15bb24bba255.yaml
new file mode 100644
index 000000000..6ce3e88b6
--- /dev/null
+++ b/releasenotes/notes/remove-ironic-max_concurrent_builds-c1ca15bb24bba255.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``nova::compute::ironic::max_concurrent_builds`` parameter has been
+    removed.