Simplify conntrack package name selection

voxpupuli · Sep 27, 2024 · 682d184 · 682d184
1 parent 4a380fc
commit 682d184
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/manifests/node.pp b/manifests/node.pp
@@ -65,12 +65,10 @@
   }
   if $k8s::manage_packages {
     # Ensure conntrack is installed to properly handle networking cleanup
-    if fact('os.family') == 'Debian' {
-      $_conntrack = 'conntrack'
-    } else {
-      $_conntrack = 'conntrack-tools'
+    $_conntrack = fact('os.family') ? {
+      'Debian' => 'conntrack',
+      default  => 'conntrack-tools',
     }
-
     ensure_packages([$_conntrack,])
   }
 

diff --git a/spec/classes/node_spec.rb b/spec/classes/node_spec.rb
@@ -14,6 +14,12 @@
       let(:facts) { os_facts }
 
       it { is_expected.to compile }
+
+      if os_facts.dig('os', 'family') == 'Debian'
+        it { is_expected.to contain_package 'conntrack' }
+      else
+        it { is_expected.to contain_package 'conntrack-tools' }
+      end
     end
   end
 end