[bigtop] branch master updated: BIGTOP-3398. Fix GPDB puppet manifest to work. (#668)

[iw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 6118913  BIGTOP-3398. Fix GPDB puppet manifest to work. (#668)
6118913 is described below

commit 61189136ef6245fc60247daf9461b6998d25d6c5
Author: Kengo Seki <se...@apache.org>
AuthorDate: Tue Sep 8 20:55:35 2020 +0900

    BIGTOP-3398. Fix GPDB puppet manifest to work. (#668)
---
 .../puppet/modules/gpdb/manifests/init.pp          | 33 ++++++++++++++--------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/bigtop-deploy/puppet/modules/gpdb/manifests/init.pp b/bigtop-deploy/puppet/modules/gpdb/manifests/init.pp
index ce711b8..bdf6d55 100644
--- a/bigtop-deploy/puppet/modules/gpdb/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/gpdb/manifests/init.pp
@@ -76,7 +76,7 @@ class gpdb {
       db_base_dir             => $gpdb::common::db_base_dir,
       master_db_port          => $gpdb::common::master_db_port,
       segment_db_port_prefix  => $gpdb::common::segment_db_port_prefix,
-      require                 => [ Server["stop_if_running"], Class['gpdb::common::stop_master_in_admin_mode'] ],
+      require                 => [ Gpdb::Server["stop_if_running"], Class['gpdb::common::stop_master_in_admin_mode'] ],
       start_or_stop           => running,
     }
 
@@ -95,29 +95,40 @@ class gpdb {
 
     class install_packages{
       case $operatingsystem{
-        /(?i:(centos|fedora))/: {
+        /(?i:(centos|fedora|redhat))/: {
+          if ($operatingsystem != 'Fedora') {
+            if (versioncmp($operatingsystemmajrelease, '8') < 0) {
+              $base_url = 'http://download.fedoraproject.org/pub/epel/$releasever/$basearch'
+              $python_devel = 'python-devel'
+            } else {
+              $base_url = 'http://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch'
+              $python_devel = 'python2-devel'
+            }
+          } else {
+            # Looks like it works, at least with Fedora 31
+            $base_url = 'http://download.fedoraproject.org/pub/epel/7/$basearch'
+            $python_devel = 'python2-devel'
+          }
           yumrepo { "epel":
-            baseurl  => "http://download.fedoraproject.org/pub/epel/7/\$basearch",
+            baseurl  => $base_url,
             descr    => "epel packages",
             enabled  => 1,
             gpgcheck => 0,
           }
-          package { ["libffi-devel"]:
+          package { [$python_devel]:
             ensure => latest,
           }
-          package { ["python-lockfile"]:
+          package { ["libffi-devel"]:
             ensure => latest,
           }
-          package { ["gcc"]:
+          package { ["python2-lockfile"]:
             ensure => latest,
           }
-          package { ["python-devel"]:
+          package { ["gcc"]:
             ensure => latest,
           }
-          package { ["psutil"]:
+          package { ["python2-psutil"]:
             ensure   => latest,
-            provider => pip,
-            require  => [ File["/usr/bin/pip-python"], Package["gcc"], Package["python-devel"] ],
           }
           package { ["paramiko"]:
             ensure   => latest,
@@ -129,7 +140,7 @@ class gpdb {
             require => [
               Yumrepo["epel"],
               Package["libffi-devel"],
-              Package["python-lockfile"],
+              Package["python2-lockfile"],
             ],
           }
 	  file { '/usr/bin/pip-python':