diff --git a/manifests/compute/libvirt.pp b/manifests/compute/libvirt.pp index 98de10c0e..2c71213ce 100644 --- a/manifests/compute/libvirt.pp +++ b/manifests/compute/libvirt.pp @@ -65,6 +65,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 +# # [*inject_password*] # (optional) Inject the admin password at boot time, without an agent. # Defaults to false @@ -323,6 +327,7 @@ class nova::compute::libvirt ( $disk_cachemodes = [], $hw_disk_discard = $::os_service_default, $hw_machine_type = $::os_service_default, + $sysinfo_serial = $::os_service_default, $inject_password = false, $inject_key = false, $inject_partition = -2, @@ -601,6 +606,7 @@ in a future release. Use the enabled_perf_events parameter instead') 'libvirt/inject_partition': value => $inject_partition_real; 'libvirt/hw_disk_discard': value => $hw_disk_discard_real; 'libvirt/hw_machine_type': value => $hw_machine_type_real; + 'libvirt/sysinfo_serial': value => $sysinfo_serial; 'libvirt/enabled_perf_events': value => join(any2array($enabled_perf_events_real), ','); '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 7bfa27be2..6b2168242 100644 --- a/spec/classes/nova_compute_libvirt_spec.rb +++ b/spec/classes/nova_compute_libvirt_spec.rb @@ -58,6 +58,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('libvirt/rx_queue_size').with_value('')} it { is_expected.to contain_nova_config('libvirt/tx_queue_size').with_value('')} @@ -90,6 +91,7 @@ describe 'nova::compute::libvirt' do :disk_cachemodes => ['file=directsync','block=none'], :hw_disk_discard => 'unmap', :hw_machine_type => 'x86_64=machinetype1,armv7l=machinetype2', + :sysinfo_serial => 'auto', :enabled_perf_events => ['cmt', 'mbml', 'mbmt'], :libvirt_service_name => 'custom_service', :virtlock_service_name => 'virtlock', @@ -133,6 +135,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('libvirt/rx_queue_size').with_value(512)}