openstack/puppet-nova
Code Issues Proposed changes

Merge "Accept array for [libvirt] pmem_namespaces"

Browse Source
This commit is contained in:
Zuul
2022-03-16 21:45:11 +00:00
committed by Gerrit Code Review
parent a90b5089eb 9f82e036c8
commit 68ea6900d8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/compute/libvirt.pp
View File

@@ -385,7 +385,7 @@ class nova::compute::libvirt (
'libvirt/nfs_mount_options': value => $nfs_mount_options; 'libvirt/nfs_mount_options': value => $nfs_mount_options;
'libvirt/num_pcie_ports': value => $num_pcie_ports; 'libvirt/num_pcie_ports': value => $num_pcie_ports;
'libvirt/mem_stats_period_seconds': value => $mem_stats_period_seconds; 'libvirt/mem_stats_period_seconds': value => $mem_stats_period_seconds;
'libvirt/pmem_namespaces': value => $pmem_namespaces; 'libvirt/pmem_namespaces': value => join(any2array($pmem_namespaces), ',');
'libvirt/swtpm_enabled': value => $swtpm_enabled; 'libvirt/swtpm_enabled': value => $swtpm_enabled;
'libvirt/swtpm_user' : value => $swtpm_user; 'libvirt/swtpm_user' : value => $swtpm_user;
'libvirt/swtpm_group': value => $swtpm_group; 'libvirt/swtpm_group': value => $swtpm_group;

4
spec/classes/nova_compute_libvirt_spec.rb
View File

@@ -108,7 +108,7 @@ describe 'nova::compute::libvirt' do
:nfs_mount_options => 'rw,intr,nolock', :nfs_mount_options => 'rw,intr,nolock',
:num_pcie_ports => 16, :num_pcie_ports => 16,
:mem_stats_period_seconds => 20, :mem_stats_period_seconds => 20,
:pmem_namespaces => '128G:ns0|ns1|ns2|ns3', :pmem_namespaces => ['128G:ns0|ns1|ns2|ns3', '262144MB:ns4|ns5', 'MEDIUM:ns6|ns7'],
:swtpm_enabled => true, :swtpm_enabled => true,
:swtpm_user => 'libvirt', :swtpm_user => 'libvirt',
:swtpm_group => 'libvirt', :swtpm_group => 'libvirt',
@@ -148,7 +148,7 @@ describe 'nova::compute::libvirt' do
it { is_expected.to contain_nova_config('libvirt/nfs_mount_options').with_value('rw,intr,nolock')} 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)} it { is_expected.to contain_nova_config('libvirt/num_pcie_ports').with_value(16)}
it { is_expected.to contain_nova_config('libvirt/mem_stats_period_seconds').with_value(20)} it { is_expected.to contain_nova_config('libvirt/mem_stats_period_seconds').with_value(20)}
it { is_expected.to contain_nova_config('libvirt/pmem_namespaces').with_value("128G:ns0|ns1|ns2|ns3")} it { is_expected.to contain_nova_config('libvirt/pmem_namespaces').with_value('128G:ns0|ns1|ns2|ns3,262144MB:ns4|ns5,MEDIUM:ns6|ns7')}
it { is_expected.to contain_nova_config('libvirt/swtpm_enabled').with_value(true)} it { is_expected.to contain_nova_config('libvirt/swtpm_enabled').with_value(true)}
it { is_expected.to contain_nova_config('libvirt/swtpm_user').with_value('libvirt')} it { is_expected.to contain_nova_config('libvirt/swtpm_user').with_value('libvirt')}
it { is_expected.to contain_nova_config('libvirt/swtpm_group').with_value('libvirt')} it { is_expected.to contain_nova_config('libvirt/swtpm_group').with_value('libvirt')}