openstack/puppet-openstack-integration
Code Issues Proposed changes

nova: Stop overriding modular_libvirt

Browse Source 
We intended to enable modular libvirt in CentOS but actually it was
disabled because of the remaining override.

Change-Id: Ia102278df53268965b8bd4edbf6906f1373cafe9
This commit is contained in:
Takashi Kajinami 2024-10-20 01:20:33 +09:00
parent dc2c54ae01
commit 12475c8786
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/nova.pp
View File

@ -14,11 +14,6 @@
# Possible values include custom, host-model, none, host-passthrough. # Possible values include custom, host-model, none, host-passthrough.
# Defaults to 'none' # Defaults to 'none'
# #
# [*modular_libvirt*]
# (optional) Use modular libvirt daemons instead of the monolithic libvirtd
# deamon
# Defaults to false
#
# [*volume_encryption*] # [*volume_encryption*]
# (optional) Boolean to configure or not volume encryption # (optional) Boolean to configure or not volume encryption
# Defaults to false. # Defaults to false.
@ -39,7 +34,6 @@ class openstack_integration::nova (
$libvirt_rbd = false, $libvirt_rbd = false,
$libvirt_virt_type = 'qemu', $libvirt_virt_type = 'qemu',
$libvirt_cpu_mode = 'none', $libvirt_cpu_mode = 'none',
$modular_libvirt = false,
$volume_encryption = false, $volume_encryption = false,
$notification_topics = $facts['os_service_default'], $notification_topics = $facts['os_service_default'],
$cinder_enabled = false, $cinder_enabled = false,
@ -235,9 +229,8 @@ class openstack_integration::nova (
default => 'tcp' default => 'tcp'
} }
class { 'nova::migration::libvirt': class { 'nova::migration::libvirt':
transport => $migration_transport, transport => $migration_transport,
listen_address => $::openstack_integration::config::host, listen_address => $::openstack_integration::config::host,
modular_libvirt => $modular_libvirt,
} }
$images_type = $libvirt_rbd ? { $images_type = $libvirt_rbd ? {
@ -250,9 +243,7 @@ class openstack_integration::nova (
images_type => $images_type, images_type => $images_type,
manage_libvirt_services => false, manage_libvirt_services => false,
} }
class { 'nova::compute::libvirt::services': class { 'nova::compute::libvirt::services': }
modular_libvirt => $modular_libvirt,
}
class { 'nova::compute::libvirt::networks': } class { 'nova::compute::libvirt::networks': }
if $libvirt_rbd { if $libvirt_rbd {
class { 'nova::compute::rbd': class { 'nova::compute::rbd':