Merge pull request #119 from jordiprats/master

cleanup
NTTCom-MS · Jun 8, 2020 · 2c9455c · 2c9455c
2 parents 8a6023f + 09f65eb
commit 2c9455c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 201 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,12 @@
 # CHANGELOG
 
-## 0.4.29
+## 0.5.1
 
 * fix raspbian bug
 * fix client dependency
+* added support for **RHEL/CentOS 8**
 
-## 0.4.16
+## 0.5.0
 
 * added ability to control whether the replica should be paused
 * added support for **Debian 8, 9 and 10** and **Ubuntu 14.04, 16.04, 18.04 and 20.04**

diff --git a/examples/demo_pg92.pp b/examples/demo_pg92.pp
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -85,100 +85,30 @@
       $postgresgroup='postgres'
       $postgreshome='/var/lib/pgsql'
 
-      case $::operatingsystem
+      $reposource =  {
+                      '9.6' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
+                      '10' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
+                      '11' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
+                      '12' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
+                      }
+      $reponame = {
+                    '9.6' => 'pgdg-redhat-repo',
+                    '10' => 'pgdg-redhat-repo',
+                    '11' => 'pgdg-redhat-repo',
+                    '12' => 'pgdg-redhat-repo',
+                  }
+
+      case $::operatingsystemrelease
       {
-        'RedHat':
+        /^6.*$/:
         {
-          case $::operatingsystemrelease
-          {
-            /^6.*$/:
-            {
-              $systemd=false
-              $reposource =  {
-                              '9.2' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                              '9.6' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                              '10' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                              '11' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                              '12' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                              }
-              $reponame = {
-                            '9.2' => 'pgdg-redhat-repo',
-                            '9.6' => 'pgdg-redhat-repo',
-                            '10' => 'pgdg-redhat-repo',
-                            '11' => 'pgdg-redhat-repo',
-                            '12' => 'pgdg-redhat-repo',
-                          }
-            }
-            /^7.*$/:
-              {
-                $systemd=true
-                $reposource =  {
-                                '9.2' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                                '9.6' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                                '10' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                                '11' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                                '12' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                                }
-                $reponame = {
-                              '9.2' => 'pgdg-redhat-repo',
-                              '9.6' => 'pgdg-redhat-repo',
-                              '10' => 'pgdg-redhat-repo',
-                              '11' => 'pgdg-redhat-repo',
-                              '12' => 'pgdg-redhat-repo',
-                            }
-              }
-            default: { fail("Unsupported RHEL version! - ${::operatingsystemrelease}")  }
-          }
+          $systemd=false
         }
-        'CentOS':
+        /^[78].*$/:
         {
-          case $::operatingsystemrelease
-          {
-            /^6.*$/:
-            {
-              $systemd=false
-              $reposource =  {
-                              '9.2' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                              '9.6' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                              '10' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                              '11' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                              '12' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                              }
-              $reponame = {
-                            '9.2' => 'pgdg-redhat-repo',
-                            '9.6' => 'pgdg-redhat-repo',
-                            '10' => 'pgdg-redhat-repo',
-                            '11' => 'pgdg-redhat-repo',
-                            '12' => 'pgdg-redhat-repo',
-                          }
-
-            }
-            /^7.*$/:
-            {
-              $systemd=true
-              $reposource =  {
-                              '9.2' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                              '9.6' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                              '10' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                              '11' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                              '12' => 'https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm',
-                              }
-              $reponame = {
-                            '9.2' => 'pgdg-redhat-repo',
-                            '9.6' => 'pgdg-redhat-repo',
-                            '10' => 'pgdg-redhat-repo',
-                            '11' => 'pgdg-redhat-repo',
-                            '12' => 'pgdg-redhat-repo',
-                          }
-              # NOTA:
-              # # rpm -qi -p https://download.postgresql.org/pub/repos/yum/10/redhat/rhel-7-x86_64/pgdg-centos10-10-2.noarch.rpm
-              # Name        : pgdg-redhat-repo
-
-            }
-            default: { fail("Unsupported CentOS version! - ${::operatingsystemrelease}")  }
-          }
+          $systemd=true
         }
-        default: { fail('Unsupported flavor')}
+        default: { fail("Unsupported version! - ${::operatingsystemrelease}")  }
       }
     }
     'Debian':

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "eyp-postgresql",
-  "version": "0.4.29",
+  "version": "0.5.1",
   "author": "eyp",
   "summary": "postgresql and pgbounce installation, configuration and management",
   "license": "Apache-2.0",
@@ -21,11 +21,11 @@
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
-      "operatingsystemrelease": [ "6", "7" ]
+      "operatingsystemrelease": [ "6", "7", "8" ]
     },
     {
       "operatingsystem": "CentOS",
-      "operatingsystemrelease": [ "6", "7" ]
+      "operatingsystemrelease": [ "6", "7", "8" ]
     },
     {
       "operatingsystem": "Ubuntu",

diff --git a/spec/acceptance/pg92_spec.rb b/spec/acceptance/pg92_spec.rb