From 48e2dc4e880778fd3d841ecbc537ef5e42b5e69e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 23 May 2023 11:27:32 +0900
Subject: [PATCH] Remove remaining deprecated libvirt parameter

This parameter was deprecated during 2023.1 cycle when we removed
the other libvirt parameters[1], and has had no effect since then.

[1] 2e0ea37ad5b3575fdf584237c361d79eda7997b2

Change-Id: Ic656dab4fc49875544289f405f16c7e8a1a11a7c
---
 manifests/compute/libvirt.pp                        | 13 -------------
 ...bvirt-opts-further-cleanup-822207eb74910cff.yaml |  4 ++++
 2 files changed, 4 insertions(+), 13 deletions(-)
 create mode 100644 releasenotes/notes/libvirt-opts-further-cleanup-822207eb74910cff.yaml

diff --git a/manifests/compute/libvirt.pp b/manifests/compute/libvirt.pp
index 873305b46..95b79f52c 100644
--- a/manifests/compute/libvirt.pp
+++ b/manifests/compute/libvirt.pp
@@ -229,13 +229,6 @@
 #   reboot request is made.
 #   Defaults to $facts['os_service_default']
 #
-# DEPRECATED PARAMETERS
-#
-# [*modular_libvirt*]
-#   (optional) Whether to enable modular libvirt daemons or use monolithic
-#   libvirt daemon.
-#   Defaults to undef
-#
 class nova::compute::libvirt (
   $ensure_package                             = 'present',
   $virt_type                                  = 'kvm',
@@ -281,8 +274,6 @@ class nova::compute::libvirt (
   $max_queues                                 = $facts['os_service_default'],
   $num_memory_encrypted_guests                = $facts['os_service_default'],
   $wait_soft_reboot_seconds                   = $facts['os_service_default'],
-  # DEPRECATED PARAMETERS
-  $modular_libvirt                            = undef,
 ) inherits nova::params {
 
   include nova::deps
@@ -291,10 +282,6 @@ class nova::compute::libvirt (
   validate_legacy(Boolean, 'validate_bool', $migration_support)
   validate_legacy(Boolean, 'validate_bool', $manage_libvirt_services)
 
-  if $modular_libvirt != undef {
-    warning('The modular_libvirt parameter has been deprecated and has no effect.')
-  }
-
   # cpu_mode has different defaults depending on hypervisor.
   if !$cpu_mode {
     case $virt_type {
diff --git a/releasenotes/notes/libvirt-opts-further-cleanup-822207eb74910cff.yaml b/releasenotes/notes/libvirt-opts-further-cleanup-822207eb74910cff.yaml
new file mode 100644
index 000000000..9c503e904
--- /dev/null
+++ b/releasenotes/notes/libvirt-opts-further-cleanup-822207eb74910cff.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``nova::compute::libvirt::modular_libvirt`` parameter has been removed.