aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-01 08:54:40 +0000
committerGerrit Code Review <review@openstack.org>2017-09-01 08:54:40 +0000
commitdc296a86081a9595b5bf8fdd3bbab9d6eec5a81c (patch)
tree854913d2a9b6c5467ad041dc945a8843390a7590
parent0457aa12e65e3d1fa6125da6e609fbd547d1b9d7 (diff)
parent6786525fda6b8b2e3ca7ade98666a5ba1758d5af (diff)
Merge "Repair immediate VF configuration for PCI SR-IOV" into stable/pike
-rw-r--r--manifests/host/sriov.pp2
-rw-r--r--spec/classes/tripleo_host_sriov_spec.rb4
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"