ovh/pci-test
1
0
Fork 0
Code

B

Browse Source 
(cherry picked from commit 372c155800)
This commit is contained in:
Arnaud Morin 2019-10-07 11:57:52 +02:00
parent edc8ed73b4
commit 5e3521bcb1
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libvirt.pp
View File

@ -33,6 +33,12 @@
# cpu_mode="custom" and virt_type="kvm|qemu". # cpu_mode="custom" and virt_type="kvm|qemu".
# Defaults to undef # Defaults to undef
# #
# [*libvirt_cpu_model_extra_flags*]
# (optional) This allows specifying granular CPU feature flags when
# specifying CPU models. Only valid, if cpu_mode and cpu_model
# attributes are specified and only if cpu_mode="custom".
# Defaults to undef
#
# [*libvirt_snapshot_image_format*] # [*libvirt_snapshot_image_format*]
# (optional) Format to save snapshots to. Some filesystems # (optional) Format to save snapshots to. Some filesystems
# have a preference and only operate on raw or qcow2 # have a preference and only operate on raw or qcow2
@ -138,6 +144,7 @@ class nova::compute::libvirt (
$migration_support = false, $migration_support = false,
$libvirt_cpu_mode = false, $libvirt_cpu_mode = false,
$libvirt_cpu_model = undef, $libvirt_cpu_model = undef,
$libvirt_cpu_model_extra_flags = undef,
$libvirt_snapshot_image_format = $::os_service_default, $libvirt_snapshot_image_format = $::os_service_default,
$libvirt_disk_cachemodes = [], $libvirt_disk_cachemodes = [],
$libvirt_hw_disk_discard = $::os_service_default, $libvirt_hw_disk_discard = $::os_service_default,
@ -235,14 +242,20 @@ class nova::compute::libvirt (
validate_string($libvirt_cpu_model) validate_string($libvirt_cpu_model)
nova_config { nova_config {
'libvirt/cpu_model': value => $libvirt_cpu_model; 'libvirt/cpu_model': value => $libvirt_cpu_model;
'libvirt/cpu_model_extra_flags': value => $libvirt_cpu_model_extra_flags;
} }
} else { } else {
nova_config { nova_config {
'libvirt/cpu_model': ensure => absent; 'libvirt/cpu_model': ensure => absent;
'libvirt/cpu_model_extra_flags': ensure => absent;
} }
if $libvirt_cpu_model { if $libvirt_cpu_model {
warning('$libvirt_cpu_model requires that $libvirt_cpu_mode => "custom" and will be ignored') warning('$libvirt_cpu_model requires that $libvirt_cpu_mode => "custom" and will be ignored')
} }
if $libvirt_cpu_model_extra_flags {
warning('$libvirt_cpu_model_extra_flags requires that $libvirt_cpu_mode => "custom" and will be ignored')
}
} }
if size($libvirt_disk_cachemodes) > 0 { if size($libvirt_disk_cachemodes) > 0 {