Merge "Ensure other_config:emc-insert-inv-prob is unset"

manifests/dpdk.pp

@@ -141,6 +141,11 @@ class vswitch::dpdk (
       value => 0,
       wait  => false,
     }
+  } else {
+    vs_config { 'other_config:emc-insert-inv-prob':
+      ensure => absent,
+      wait   => false,
+    }
   }
 
   if is_service_default($vlan_limit) {

manifests/ovs.pp

@@ -77,6 +77,11 @@ class vswitch::ovs(
       value => 0,
       wait  => false,
     }
+  } else {
+    vs_config { 'other_config:emc-insert-inv-prob':
+      ensure => absent,
+      wait   => false,
+    }
   }
 
   if is_service_default($vlan_limit) {

spec/classes/vswitch_dpdk_spec.rb

@@ -53,7 +53,9 @@ describe 'vswitch::dpdk' do
         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:emc-insert-inv-prob').with(
+          :ensure => 'absent', :wait => false
+        )
         is_expected.to contain_vs_config('other_config:vlan-limit').with(
           :value => nil, :wait => true,
         )

spec/classes/vswitch_ovs_spec.rb

@@ -28,7 +28,9 @@ describe 'vswitch::ovs' do
       end
 
       it 'configures disable_emc option to false' do
-          is_expected.to_not contain_vs_config('other_config:emc-insert-inv-prob')
+        is_expected.to contain_vs_config('other_config:emc-insert-inv-prob').with(
+          :ensure => 'absent', :wait => false
+        )
       end
 
       it 'clears vlan-limit option' do