Add support for [libvirt] volume_enforce_multipath

... which was added during this cycle.

Depends-on: https://review.opendev.org/845660
Change-Id: Ifed582c5fa64236c8b0f385b370b8093620feb3b
This commit is contained in:
Takashi Kajinami
2025-02-28 09:33:18 +09:00
parent 4399291594
commit b0fe8da29d
3 changed files with 15 additions and 3 deletions

View File

@@ -164,9 +164,11 @@
# Defaults to $facts['os_service_default']
#
# [*volume_use_multipath*]
# (optional) Use multipath connection of the
# iSCSI or FC volume. Volumes can be connected in the
# LibVirt as multipath devices.
# (optional) Use multipath connection of the iSCSI or FC volume.
# Defaults to $facts['os_service_default']
#
# [*volume_enforce_multipath*]
# (optional) Require multipathd when attaching a volume to an instance.
# Defaults to $facts['os_service_default']
#
# [*num_volume_scan_tries*]
@@ -270,6 +272,7 @@ class nova::compute::libvirt (
$file_backed_memory = $facts['os_service_default'],
$images_type = $facts['os_service_default'],
$volume_use_multipath = $facts['os_service_default'],
$volume_enforce_multipath = $facts['os_service_default'],
$num_volume_scan_tries = $facts['os_service_default'],
$nfs_mount_options = $facts['os_service_default'],
$num_pcie_ports = $facts['os_service_default'],
@@ -387,6 +390,7 @@ class nova::compute::libvirt (
'libvirt/file_backed_memory': value => $file_backed_memory;
'libvirt/images_type': value => $images_type;
'libvirt/volume_use_multipath': value => $volume_use_multipath;
'libvirt/volume_enforce_multipath': value => $volume_enforce_multipath;
'libvirt/num_volume_scan_tries': value => $num_volume_scan_tries;
'libvirt/nfs_mount_options': value => $nfs_mount_options;
'libvirt/num_pcie_ports': value => $num_pcie_ports;

View File

@@ -0,0 +1,5 @@
---
features:
- |
The new ``nova::compute::libvirt::volume_enforce_multipath`` parameter has
added.

View File

@@ -45,6 +45,7 @@ describe 'nova::compute::libvirt' do
it { is_expected.to contain_nova_config('libvirt/file_backed_memory').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/images_type').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/volume_use_multipath').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/volume_enforce_multipath').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/num_volume_scan_tries').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/nfs_mount_options').with_value('<SERVICE DEFAULT>')}
it { is_expected.to contain_nova_config('libvirt/num_pcie_ports').with_value('<SERVICE DEFAULT>')}
@@ -89,6 +90,7 @@ describe 'nova::compute::libvirt' do
:file_backed_memory => 2048,
:images_type => 'raw',
:volume_use_multipath => false,
:volume_enforce_multipath => false,
:num_volume_scan_tries => 3,
:nfs_mount_options => 'rw,intr,nolock',
:num_pcie_ports => 16,
@@ -138,6 +140,7 @@ describe 'nova::compute::libvirt' do
it { is_expected.to contain_nova_config('libvirt/file_backed_memory').with_value(2048)}
it { is_expected.to contain_nova_config('libvirt/images_type').with_value('raw')}
it { is_expected.to contain_nova_config('libvirt/volume_use_multipath').with_value(false)}
it { is_expected.to contain_nova_config('libvirt/volume_enforce_multipath').with_value(false)}
it { is_expected.to contain_nova_config('libvirt/num_volume_scan_tries').with_value(3)}
it { is_expected.to contain_nova_config('libvirt/nfs_mount_options').with_value('rw,intr,nolock')}
it { is_expected.to contain_nova_config('libvirt/num_pcie_ports').with_value(16)}