Support RedHat/CentOS 8

treydock · treydock · commit bae590713896 · 2020-12-14T11:40:53.000-05:00
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -275,6 +275,10 @@
         $pip_category = undef
         $pip_package  = "${python}-pip"
         $pip_provider = $python.regsubst(/^.*python3\.?/,'pip3.').regsubst(/\.$/,'')
+      } elsif ($facts['os']['family'] == 'RedHat') and (versioncmp($facts['os']['release']['major'], '8') >= 0) {
+        $pip_category = undef
+        $pip_package  = 'python3-pip'
+        $pip_provider = pip3
       } elsif ($facts['os']['family'] == 'RedHat') and (versioncmp($facts['os']['release']['major'], '7') >= 0) {
         $pip_category = undef
         $pip_package  = 'python2-pip'
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -46,8 +46,11 @@
     default  => 'gunicorn',
   }
 
-  $version = $facts['os']['release']['major'] ? {
-    '20.04' => '3',
-    default => 'system',
+  if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8' {
+    $version = '3'
+  } elsif $facts['os']['release']['major'] == '20.04' {
+    $version = '3'
+  } else {
+    $version = 'system'
   }
 }
diff --git a/metadata.json b/metadata.json
@@ -25,7 +25,8 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7"
+        "7",
+        "8"
       ]
     },
     {

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,11 @@`
`46`	`46`	`default => 'gunicorn',`
`47`	`47`	`}`
`48`	`48`
`49`		`- $version = $facts['os']['release']['major'] ? {`
`50`		`- '20.04' => '3',`
`51`		`- default => 'system',`
	`49`	`+ if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8' {`
	`50`	`+ $version = '3'`
	`51`	`+ } elsif $facts['os']['release']['major'] == '20.04' {`
	`52`	`+ $version = '3'`
	`53`	`+ } else {`
	`54`	`+ $version = 'system'`
`52`	`55`	`}`
`53`	`56`	`}`