From ec7b9f29b44ccd9dda5b379c11414f23dc6ae0d7 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 21 Nov 2022 12:50:57 +0900
Subject: [PATCH] Allow customizing state of libvirt packages

... instead of hard-coding the state.

Change-Id: I4e62309109bf0889741dc2da9fcb7cd6c7ac011b
---
 manifests/compute/libvirt/services.pp           | 17 +++++++++++------
 ...libvirt-ensure_package-6136e2ae53a04974.yaml |  5 +++++
 2 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 releasenotes/notes/libvirt-ensure_package-6136e2ae53a04974.yaml

diff --git a/manifests/compute/libvirt/services.pp b/manifests/compute/libvirt/services.pp
index 26840c9c7..9710fb96a 100644
--- a/manifests/compute/libvirt/services.pp
+++ b/manifests/compute/libvirt/services.pp
@@ -4,6 +4,10 @@
 #
 # === Parameters:
 #
+# [*ensure_package*]
+#   (optional) The state of the libvirt packages.
+#   Defaults to 'present'
+#
 # [*libvirt_service_name*]
 #   (optional) libvirt service name.
 #   Defaults to $::nova::params::libvirt_service_name
@@ -46,6 +50,7 @@
 #   Defaults to $::nova::params::virtstorage_service_name
 #
 class nova::compute::libvirt::services (
+  $ensure_package           = 'present',
   $libvirt_service_name     = $::nova::params::libvirt_service_name,
   $virtlock_service_name    = $::nova::params::virtlock_service_name,
   $virtlog_service_name     = $::nova::params::virtlog_service_name,
@@ -65,7 +70,7 @@ class nova::compute::libvirt::services (
     # libvirt-nwfilter
     if $::osfamily == 'RedHat' {
       package { 'libvirt-nwfilter':
-        ensure => present,
+        ensure => $ensure_package,
         name   => $::nova::params::libvirt_nwfilter_package_name,
         before => Service['libvirt'],
         tag    => ['openstack', 'nova-support-package'],
@@ -87,7 +92,7 @@ class nova::compute::libvirt::services (
 
     # libvirt
     package { 'libvirt':
-      ensure => present,
+      ensure => $ensure_package,
       name   => $libvirt_package_name_real,
       tag    => ['openstack', 'nova-support-package'],
     }
@@ -159,7 +164,7 @@ class nova::compute::libvirt::services (
 
     if $virtsecret_service_name {
       package { 'virtsecret':
-        ensure => present,
+        ensure => $ensure_package,
         name   => "${::nova::params::libvirt_daemon_package_prefix}driver-secret",
         tag    => ['openstack', 'nova-support-package'],
       }
@@ -174,7 +179,7 @@ class nova::compute::libvirt::services (
 
     if $virtnodedev_service_name {
       package { 'virtnodedev':
-        ensure => present,
+        ensure => $ensure_package,
         name   => "${::nova::params::libvirt_daemon_package_prefix}driver-nodedev",
         tag    => ['openstack', 'nova-support-package'],
       }
@@ -189,7 +194,7 @@ class nova::compute::libvirt::services (
 
     if $virtqemu_service_name {
       package { 'virtqemu':
-        ensure => present,
+        ensure => $ensure_package,
         name   => "${::nova::params::libvirt_daemon_package_prefix}driver-qemu",
         tag    => ['openstack', 'nova-support-package'],
       }
@@ -214,7 +219,7 @@ class nova::compute::libvirt::services (
 
     if $virtstorage_service_name {
       package { 'virtstorage':
-        ensure => present,
+        ensure => $ensure_package,
         name   => "${::nova::params::libvirt_daemon_package_prefix}driver-storage",
         tag    => ['openstack', 'nova-support-package'],
       }
diff --git a/releasenotes/notes/libvirt-ensure_package-6136e2ae53a04974.yaml b/releasenotes/notes/libvirt-ensure_package-6136e2ae53a04974.yaml
new file mode 100644
index 000000000..5d4d9d4d0
--- /dev/null
+++ b/releasenotes/notes/libvirt-ensure_package-6136e2ae53a04974.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The ``nova::compute::libvirt::services::ensure_package`` parmaeter has been
+    added. This allows defining state of the libvirt packages.