openstack/puppet-nova
Code Issues Proposed changes

Allow customizing state of libvirt packages

Browse Source 
... instead of hard-coding the state.

Change-Id: I4e62309109bf0889741dc2da9fcb7cd6c7ac011b
This commit is contained in:
Takashi Kajinami
2022-11-21 12:50:57 +09:00
parent 69d4a6d51d
commit ec7b9f29b4
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/compute/libvirt/services.pp
View File

@@ -4,6 +4,10 @@
# #
# === Parameters: # === Parameters:
# #
# [*ensure_package*]
# (optional) The state of the libvirt packages.
# Defaults to 'present'
#
# [*libvirt_service_name*] # [*libvirt_service_name*]
# (optional) libvirt service name. # (optional) libvirt service name.
# Defaults to $::nova::params::libvirt_service_name # Defaults to $::nova::params::libvirt_service_name
@@ -46,6 +50,7 @@
# Defaults to $::nova::params::virtstorage_service_name # Defaults to $::nova::params::virtstorage_service_name
# #
class nova::compute::libvirt::services ( class nova::compute::libvirt::services (
$ensure_package = 'present',
$libvirt_service_name = $::nova::params::libvirt_service_name, $libvirt_service_name = $::nova::params::libvirt_service_name,
$virtlock_service_name = $::nova::params::virtlock_service_name, $virtlock_service_name = $::nova::params::virtlock_service_name,
$virtlog_service_name = $::nova::params::virtlog_service_name, $virtlog_service_name = $::nova::params::virtlog_service_name,
@@ -65,7 +70,7 @@ class nova::compute::libvirt::services (
# libvirt-nwfilter # libvirt-nwfilter
if $::osfamily == 'RedHat' { if $::osfamily == 'RedHat' {
package { 'libvirt-nwfilter': package { 'libvirt-nwfilter':
ensure => present, ensure => $ensure_package,
name => $::nova::params::libvirt_nwfilter_package_name, name => $::nova::params::libvirt_nwfilter_package_name,
before => Service['libvirt'], before => Service['libvirt'],
tag => ['openstack', 'nova-support-package'], tag => ['openstack', 'nova-support-package'],
@@ -87,7 +92,7 @@ class nova::compute::libvirt::services (
# libvirt # libvirt
package { 'libvirt': package { 'libvirt':
ensure => present, ensure => $ensure_package,
name => $libvirt_package_name_real, name => $libvirt_package_name_real,
tag => ['openstack', 'nova-support-package'], tag => ['openstack', 'nova-support-package'],
} }
@@ -159,7 +164,7 @@ class nova::compute::libvirt::services (
if $virtsecret_service_name { if $virtsecret_service_name {
package { 'virtsecret': package { 'virtsecret':
ensure => present, ensure => $ensure_package,
name => "${::nova::params::libvirt_daemon_package_prefix}driver-secret", name => "${::nova::params::libvirt_daemon_package_prefix}driver-secret",
tag => ['openstack', 'nova-support-package'], tag => ['openstack', 'nova-support-package'],
} }
@@ -174,7 +179,7 @@ class nova::compute::libvirt::services (
if $virtnodedev_service_name { if $virtnodedev_service_name {
package { 'virtnodedev': package { 'virtnodedev':
ensure => present, ensure => $ensure_package,
name => "${::nova::params::libvirt_daemon_package_prefix}driver-nodedev", name => "${::nova::params::libvirt_daemon_package_prefix}driver-nodedev",
tag => ['openstack', 'nova-support-package'], tag => ['openstack', 'nova-support-package'],
} }
@@ -189,7 +194,7 @@ class nova::compute::libvirt::services (
if $virtqemu_service_name { if $virtqemu_service_name {
package { 'virtqemu': package { 'virtqemu':
ensure => present, ensure => $ensure_package,
name => "${::nova::params::libvirt_daemon_package_prefix}driver-qemu", name => "${::nova::params::libvirt_daemon_package_prefix}driver-qemu",
tag => ['openstack', 'nova-support-package'], tag => ['openstack', 'nova-support-package'],
} }
@@ -214,7 +219,7 @@ class nova::compute::libvirt::services (
if $virtstorage_service_name { if $virtstorage_service_name {
package { 'virtstorage': package { 'virtstorage':
ensure => present, ensure => $ensure_package,
name => "${::nova::params::libvirt_daemon_package_prefix}driver-storage", name => "${::nova::params::libvirt_daemon_package_prefix}driver-storage",
tag => ['openstack', 'nova-support-package'], tag => ['openstack', 'nova-support-package'],
} }

5
releasenotes/notes/libvirt-ensure_package-6136e2ae53a04974.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
features:
- |
The ``nova::compute::libvirt::services::ensure_package`` parmaeter has been
added. This allows defining state of the libvirt packages.