From 6786525fda6b8b2e3ca7ade98666a5ba1758d5af Mon Sep 17 00:00:00 2001 From: Brent Eagles Date: Thu, 24 Aug 2017 17:13:01 -0230 Subject: Repair immediate VF configuration for PCI SR-IOV Change I71edc135432ab2193741c37ce977dd11172401e6 broke the host VF configuration that set VF counts when the puppet is applied. This patch re-adds the ensure => present property required for proper behavior. Change-Id: Ibd18c4f3b7f0d8cee330f94f87e7ad4ea7ceeffb Closes-Bug: #1712903 (cherry picked from commit 1e133f31466bf17df66b0f552a2ce5b3b056e666) --- manifests/host/sriov.pp | 2 +- spec/classes/tripleo_host_sriov_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/host/sriov.pp b/manifests/host/sriov.pp index c06796d..b94c472 100644 --- a/manifests/host/sriov.pp +++ b/manifests/host/sriov.pp @@ -16,7 +16,7 @@ class tripleo::host::sriov ( ) { if !empty($number_of_vfs) { - sriov_vf_config { $number_of_vfs: } + sriov_vf_config { $number_of_vfs: ensure => present } # the numvfs configuration needs to be persisted for every boot tripleo::host::sriov::numvfs_persistence {'persistent_numvfs': diff --git a/spec/classes/tripleo_host_sriov_spec.rb b/spec/classes/tripleo_host_sriov_spec.rb index eb2213a..4c81c72 100644 --- a/spec/classes/tripleo_host_sriov_spec.rb +++ b/spec/classes/tripleo_host_sriov_spec.rb @@ -17,8 +17,8 @@ describe 'tripleo::host::sriov' do end it 'configures numvfs' do - is_expected.to contain_sriov_vf_config('eth0:4') - is_expected.to contain_sriov_vf_config('eth1:5') + is_expected.to contain_sriov_vf_config('eth0:4').with( :ensure => 'present' ) + is_expected.to contain_sriov_vf_config('eth1:5').with( :ensure => 'present' ) is_expected.to contain_tripleo__host__sriov__numvfs_persistence('persistent_numvfs').with( :vf_defs => ['eth0:4','eth1:5'], :content_string => "#!/bin/bash\n" -- cgit 1.2.3-korg