diff --git a/manifests/compute/libvirt.pp b/manifests/compute/libvirt.pp index c00c538f8..3dfd4b582 100644 --- a/manifests/compute/libvirt.pp +++ b/manifests/compute/libvirt.pp @@ -114,11 +114,6 @@ # (optional) virtlog service name. # Defaults to $::nova::params::virtlog_service_name # -# [*modular_libvirt*] -# (optional) Whether to enable modular libvirt daemons or use monolithic -# libvirt daemon. -# Defaults to $::nova::params::modular_libvirt -# # [*compute_driver*] # (optional) Compute driver. # Defaults to 'libvirt.LibvirtDriver' @@ -218,28 +213,11 @@ # reboot request is made. # Defaults to $facts['os_service_default'] # -# DEPRECATED PARAMETRS +# DEPRECATED PARAMETERS # -# [*log_outputs*] -# (optional) Defines log outputs, as specified in -# https://libvirt.org/logging.html -# Defaults to undef -# -# [*log_filters*] -# (optional) Defines a filter to select a different logging level -# for a given category log outputs, as specified in -# https://libvirt.org/logging.html -# Defaults to undef -# -# [*tls_priority*] -# (optional) Override the compile time default TLS priority string. The -# default is usually "NORMAL" unless overridden at build time. -# Only set this if it is desired for libvirt to deviate from -# the global default settings. -# Defaults to undef -# -# [*ovs_timeout*] -# (optional) A timeout for openvswitch calls made by libvirt +# [*modular_libvirt*] +# (optional) Whether to enable modular libvirt daemons or use monolithic +# libvirt daemon. # Defaults to undef # class nova::compute::libvirt ( @@ -265,7 +243,6 @@ class nova::compute::libvirt ( $libvirt_service_name = $::nova::params::libvirt_service_name, $virtlock_service_name = $::nova::params::virtlock_service_name, $virtlog_service_name = $::nova::params::virtlog_service_name, - $modular_libvirt = $::nova::params::modular_libvirt, $compute_driver = 'libvirt.LibvirtDriver', $preallocate_images = $facts['os_service_default'], $manage_libvirt_services = true, @@ -285,10 +262,7 @@ class nova::compute::libvirt ( $num_memory_encrypted_guests = $facts['os_service_default'], $wait_soft_reboot_seconds = $facts['os_service_default'], # DEPRECATED PARAMETERS - $log_outputs = undef, - $log_filters = undef, - $tls_priority = undef, - $ovs_timeout = undef, + $modular_libvirt = undef, ) inherits nova::params { include nova::deps @@ -297,6 +271,10 @@ 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 { @@ -322,15 +300,6 @@ class nova::compute::libvirt ( include nova::migration::libvirt } - if !$modular_libvirt { - ['log_outputs', 'log_filters', 'tls_priority', 'ovs_timeout'].each |String $libvirtd_opt| { - if getvar($libvirtd_opt) != undef { - warning("The ${libvirtd_opt} parameter is deprecated. Use the nova::compute::libvirt::libvirtd class.") - include nova::compute::libvirt::libvirtd - } - } - } - unless $rx_queue_size == $facts['os_service_default'] or $rx_queue_size in [256, 512, 1024] { fail("Invalid rx_queue_size parameter: ${rx_queue_size}") } diff --git a/manifests/compute/libvirt/libvirtd.pp b/manifests/compute/libvirt/libvirtd.pp index a472f79db..9d38dfd6c 100644 --- a/manifests/compute/libvirt/libvirtd.pp +++ b/manifests/compute/libvirt/libvirtd.pp @@ -62,20 +62,15 @@ class nova::compute::libvirt::libvirtd ( include nova::deps - $log_outputs_real = pick($::nova::compute::libvirt::log_outputs, $log_outputs) - $log_filters_real = pick($::nova::compute::libvirt::log_filters, $log_filters) - $tls_priority_real = pick($::nova::compute::libvirt::tls_prority, $tls_priority) - $ovs_timeout_real = pick($::nova::compute::libvirt::ovs_timeout, $ovs_timeout) - libvirtd_config { 'log_level': value => $log_level; - 'log_filters': value => $log_filters_real, quote => true; - 'log_outputs': value => $log_outputs_real, quote => true; + 'log_filters': value => $log_filters, quote => true; + 'log_outputs': value => $log_outputs, quote => true; 'max_clients': value => $max_clients; 'admin_max_clients': value => $admin_max_clients; 'max_client_requests': value => $max_client_requests; 'admin_max_client_requests': value => $admin_max_client_requests; - 'tls_priority': value => $tls_priority_real, quote => true; - 'ovs_timeout': value => $ovs_timeout_real; + 'tls_priority': value => $tls_priority, quote => true; + 'ovs_timeout': value => $ovs_timeout; } } diff --git a/releasenotes/notes/libvirt-opts-cleanup-e0a0895882303e6f.yaml b/releasenotes/notes/libvirt-opts-cleanup-e0a0895882303e6f.yaml new file mode 100644 index 000000000..f436848d2 --- /dev/null +++ b/releasenotes/notes/libvirt-opts-cleanup-e0a0895882303e6f.yaml @@ -0,0 +1,15 @@ +--- +upgrade: + - | + The following parameters of the ``nova::compute::libvirt`` class has been + removed. Use the ``nova::compute::libvirt::libvirtd`` class directly. + + - ``log_outputs`` + - ``log_filters`` + - ``tls_priority`` + - ``ovs_timeout`` + +deprecations: + - | + The ``nova::compute::libvirt::modular_libvirt`` parameter has been + deprecated. This parameter has no effect now. diff --git a/spec/classes/nova_compute_libvirt_spec.rb b/spec/classes/nova_compute_libvirt_spec.rb index 107ab68e5..ea2ff65cb 100644 --- a/spec/classes/nova_compute_libvirt_spec.rb +++ b/spec/classes/nova_compute_libvirt_spec.rb @@ -113,13 +113,8 @@ describe 'nova::compute::libvirt' do :swtpm_enabled => true, :swtpm_user => 'libvirt', :swtpm_group => 'libvirt', - :log_outputs => '1:file:/var/log/libvirt/libvirtd.log', - :log_filters => '1:qemu', - :tls_priority => 'NORMAL:-VERS-SSL3.0', - :ovs_timeout => 10, :max_queues => 4, :num_memory_encrypted_guests => 255, - :modular_libvirt => true, :wait_soft_reboot_seconds => 120, } end