diff --git a/manifests/compute/libvirt.pp b/manifests/compute/libvirt.pp index 69a925f82..2a23214a7 100644 --- a/manifests/compute/libvirt.pp +++ b/manifests/compute/libvirt.pp @@ -60,6 +60,10 @@ # (optional) Option to specify a default machine type per host architecture. # Defaults to $::os_service_default # +# [*sysinfo_serial*] +# (optional) Option to specify a serial number entry generation method. +# Defaults to $::os_service_default +# # [*libvirt_inject_password*] # (optional) Inject the admin password at boot time, without an agent. # Defaults to false @@ -216,6 +220,7 @@ class nova::compute::libvirt ( $libvirt_disk_cachemodes = [], $libvirt_hw_disk_discard = $::os_service_default, $libvirt_hw_machine_type = $::os_service_default, + $sysinfo_serial = $::os_service_default, $libvirt_inject_password = false, $libvirt_inject_key = false, $libvirt_inject_partition = -2, @@ -343,6 +348,7 @@ class nova::compute::libvirt ( 'libvirt/inject_partition': value => $libvirt_inject_partition; 'libvirt/hw_disk_discard': value => $libvirt_hw_disk_discard; 'libvirt/hw_machine_type': value => $libvirt_hw_machine_type; + 'libvirt/sysinfo_serial': value => $sysinfo_serial; 'libvirt/enabled_perf_events': value => join(any2array($libvirt_enabled_perf_events), ','); 'libvirt/rx_queue_size': value => $rx_queue_size; 'libvirt/tx_queue_size': value => $tx_queue_size; diff --git a/releasenotes/notes/libvirt_sysinfo_serial-e1603d45446726c3.yaml b/releasenotes/notes/libvirt_sysinfo_serial-e1603d45446726c3.yaml new file mode 100644 index 000000000..c6660a8df --- /dev/null +++ b/releasenotes/notes/libvirt_sysinfo_serial-e1603d45446726c3.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Add ``sysinfo_serial`` parameter to control a Serial number entry generation + method. Defaults to ``$::os_service_default``. diff --git a/spec/classes/nova_compute_libvirt_spec.rb b/spec/classes/nova_compute_libvirt_spec.rb index 5f9987666..4467b48b5 100644 --- a/spec/classes/nova_compute_libvirt_spec.rb +++ b/spec/classes/nova_compute_libvirt_spec.rb @@ -56,6 +56,7 @@ describe 'nova::compute::libvirt' do it { is_expected.to contain_nova_config('libvirt/inject_password').with_value(false)} it { is_expected.to contain_nova_config('libvirt/inject_key').with_value(false)} it { is_expected.to contain_nova_config('libvirt/inject_partition').with_value(-2)} + it { is_expected.to contain_nova_config('libvirt/sysinfo_serial').with_value('')} it { is_expected.to contain_nova_config('vnc/server_listen').with_value('127.0.0.1')} it { is_expected.to contain_nova_config('DEFAULT/remove_unused_base_images').with_ensure('absent')} it { is_expected.to contain_nova_config('DEFAULT/remove_unused_original_minimum_age_seconds').with_ensure('absent')} @@ -85,6 +86,7 @@ describe 'nova::compute::libvirt' do :libvirt_disk_cachemodes => ['file=directsync','block=none'], :libvirt_hw_disk_discard => 'unmap', :libvirt_hw_machine_type => 'x86_64=machinetype1,armv7l=machinetype2', + :sysinfo_serial => 'auto', :libvirt_enabled_perf_events => ['cmt', 'mbml', 'mbmt'], :remove_unused_base_images => true, :remove_unused_resized_minimum_age_seconds => 3600, @@ -122,6 +124,7 @@ describe 'nova::compute::libvirt' do it { is_expected.to contain_nova_config('libvirt/disk_cachemodes').with_value('file=directsync,block=none')} it { is_expected.to contain_nova_config('libvirt/hw_disk_discard').with_value('unmap')} it { is_expected.to contain_nova_config('libvirt/hw_machine_type').with_value('x86_64=machinetype1,armv7l=machinetype2')} + it { is_expected.to contain_nova_config('libvirt/sysinfo_serial').with_value('auto')} it { is_expected.to contain_nova_config('libvirt/enabled_perf_events').with_value('cmt,mbml,mbmt')} it { is_expected.to contain_nova_config('vnc/server_listen').with_value('0.0.0.0')} it { is_expected.to contain_nova_config('DEFAULT/remove_unused_base_images').with_value(true)}