Merge pull request #677 from JakeTRogers/redhat_venv

apply python-venv exclude to RedHat family instead of just CentOS
voxpupuli · Nov 28, 2023 · ad29652 · ad29652
2 parents 4a4c467 + 4e144a1
commit ad29652
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -35,7 +35,7 @@
     ##
     ## CentOS has no extra package for venv
     ##
-    unless $facts['os']['name'] == 'CentOS' {
+    unless $facts['os']['family'] == 'RedHat' {
       package { 'python-venv':
         ensure  => $python::venv,
         name    => "${python}-venv",

diff --git a/metadata.json b/metadata.json
@@ -20,6 +20,13 @@
         "7100-05-03-1837"
       ]
     },
+    {
+      "operatingsystem": "AlmaLinux",
+      "operatingsystemrelease": [
+        "8",
+        "9"
+      ]
+    },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
@@ -52,6 +59,27 @@
         "20.04"
       ]
     },
+    {
+      "operatingsystem": "OracleLinux",
+      "operatingsystemrelease": [
+        "8",
+        "9"
+      ]
+    },
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "8",
+        "9"
+      ]
+    },
+    {
+      "operatingsystem": "Rocky",
+      "operatingsystemrelease": [
+        "8",
+        "9"
+      ]
+    },
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [

diff --git a/spec/classes/python_spec.rb b/spec/classes/python_spec.rb
@@ -23,7 +23,7 @@
           it { is_expected.to contain_package('pip') }
         end
 
-        if %w[Archlinux CentOS].include?(facts[:os]['name'])
+        if %w[Archlinux RedHat].include?(facts[:os]['family'])
           it { is_expected.not_to contain_package('python-venv') }
         else
           it { is_expected.to contain_package('python-venv') }
@@ -60,7 +60,7 @@
         it { is_expected.to compile.with_all_deps }
         it { is_expected.to contain_package('pip').with(ensure: 'present') }
 
-        it { is_expected.to contain_package('python-venv').with(ensure: 'present') } unless facts[:os]['name'] == 'CentOS'
+        it { is_expected.to contain_package('python-venv').with(ensure: 'present') } unless facts[:os]['family'] == 'RedHat'
       end
 
       case facts[:os]['family']