Merge "Ensure hardware offload is disabled"

manifests/dpdk.pp

@@ -122,6 +122,12 @@ class vswitch::dpdk (
       restart => true,
       wait    => true,
     }
+  } else {
+    vs_config { 'other_config:hw-offload':
+      ensure  => absent,
+      restart => true,
+      wait    => true,
+    }
   }
   # lint:endignore
 

manifests/ovs.pp

@@ -94,6 +94,12 @@ class vswitch::ovs(
       restart => true,
       wait    => true,
     }
+  } else {
+    vs_config { 'other_config:hw-offload':
+      ensure  => absent,
+      restart => true,
+      wait    => true,
+    }
   }
   # lint:endignore
 

spec/classes/vswitch_dpdk_spec.rb

@@ -46,7 +46,9 @@ describe 'vswitch::dpdk' do
         is_expected.to contain_vs_config('other_config:dpdk-extra').with(
           :value => nil, :wait => false,
         )
-        is_expected.to_not contain_vs_config('other_config:hw-offload')
+        is_expected.to contain_vs_config('other_config:hw-offload').with(
+          :ensure => 'absent', :restart => true, :wait => true,
+        )
         is_expected.to_not contain_vs_config('other_config:emc-insert-inv-prob')
         is_expected.to contain_vs_config('other_config:vlan-limit').with(
           :ensure => 'absent', :wait => true,

spec/classes/vswitch_ovs_spec.rb

@@ -22,8 +22,10 @@ describe 'vswitch::ovs' do
         is_expected.to contain_class('vswitch::params')
       end
 
-      it 'configures hw-offload option to false' do
-          is_expected.to_not contain_vs_config('other_config:hw-offload')
+      it 'clears hw-offload option' do
+        is_expected.to contain_vs_config('other_config:hw-offload').with(
+          :ensure => 'absent', :restart => true, :wait => true,
+        )
       end
 
       it 'configures disable_emc option to false' do