Add Red Hat Enterprise Linux 9 support

The comment indicates the checks in server config need to be done on EL6
and older only. The current check would also trigger on EL9. This uses
a version comparison on the major version. We can leave out the Fedora
check since we don't need to care about Fedora < 7.

It also sets the default version on EL9 to version 13. This should also
affect CentOS Stream 9, which is supposed to work but not officially
verified to work.

Author: ekohl

manifests/globals.pp

@@ -183,6 +183,7 @@
       },
       'Amazon' => '9.2',
       default => $facts['os']['release']['major'] ? {
+        '9'     => '13',
         '8'     => '10',
         '7'     => '9.2',
         '6'     => '8.4',

manifests/server/config.pp

@@ -181,7 +181,7 @@
 
   # RedHat-based systems hardcode some PG* variables in the init script, and need to be overriden
   # in /etc/sysconfig/pgsql/postgresql. Create a blank file so we can manage it with augeas later.
-  if ($facts['os']['family'] == 'RedHat') and ($facts['os']['release']['major'] !~ /^(7|8)$/) and ($facts['os']['name'] != 'Fedora') {
+  if $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '7') < 0 {
     file { '/etc/sysconfig/pgsql/postgresql':
       ensure  => file,
       replace => false,

manifests/server/config_entry.pp

@@ -106,48 +106,45 @@
         before  => Postgresql_conf[$name],
       }
     }
-  }
-  if $facts['os']['family'] == 'RedHat' {
-    if ! ($facts['os']['release']['major'] in ['7', '8'] or $facts['os']['name'] == 'Fedora') {
-      if $name == 'port' {
-        # We need to force postgresql to stop before updating the port
-        # because puppet becomes confused and is unable to manage the
-        # service appropriately.
-        exec { "postgresql_stop_${name}":
-          command => "service ${postgresql::server::service_name} stop",
-          onlyif  => "service ${postgresql::server::service_name} status",
-          unless  => "grep 'PGPORT=${value}' /etc/sysconfig/pgsql/postgresql",
-          path    => '/sbin:/bin:/usr/bin:/usr/local/bin',
-          require => File['/etc/sysconfig/pgsql/postgresql'],
-        }
-        -> augeas { 'override PGPORT in /etc/sysconfig/pgsql/postgresql':
-          lens    => 'Shellvars.lns',
-          incl    => '/etc/sysconfig/pgsql/postgresql',
-          context => '/files/etc/sysconfig/pgsql/postgresql',
-          changes => "set PGPORT ${value}",
-          require => File['/etc/sysconfig/pgsql/postgresql'],
-          notify  => Class['postgresql::server::service'],
-          before  => Class['postgresql::server::reload'],
-        }
-      } elsif $name == 'data_directory' {
-        # We need to force postgresql to stop before updating the data directory
-        # otherwise init script breaks
-        exec { "postgresql_${name}":
-          command => "service ${postgresql::server::service_name} stop",
-          onlyif  => "service ${postgresql::server::service_name} status",
-          unless  => "grep 'PGDATA=${value}' /etc/sysconfig/pgsql/postgresql",
-          path    => '/sbin:/bin:/usr/bin:/usr/local/bin',
-          require => File['/etc/sysconfig/pgsql/postgresql'],
-        }
-        -> augeas { 'override PGDATA in /etc/sysconfig/pgsql/postgresql':
-          lens    => 'Shellvars.lns',
-          incl    => '/etc/sysconfig/pgsql/postgresql',
-          context => '/files/etc/sysconfig/pgsql/postgresql',
-          changes => "set PGDATA ${value}",
-          require => File['/etc/sysconfig/pgsql/postgresql'],
-          notify  => Class['postgresql::server::service'],
-          before  => Class['postgresql::server::reload'],
-        }
+  } elsif $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'], '7') < 0 {
+    if $name == 'port' {
+      # We need to force postgresql to stop before updating the port
+      # because puppet becomes confused and is unable to manage the
+      # service appropriately.
+      exec { "postgresql_stop_${name}":
+        command => "service ${postgresql::server::service_name} stop",
+        onlyif  => "service ${postgresql::server::service_name} status",
+        unless  => "grep 'PGPORT=${value}' /etc/sysconfig/pgsql/postgresql",
+        path    => '/sbin:/bin:/usr/bin:/usr/local/bin',
+        require => File['/etc/sysconfig/pgsql/postgresql'],
+      }
+      -> augeas { 'override PGPORT in /etc/sysconfig/pgsql/postgresql':
+        lens    => 'Shellvars.lns',
+        incl    => '/etc/sysconfig/pgsql/postgresql',
+        context => '/files/etc/sysconfig/pgsql/postgresql',
+        changes => "set PGPORT ${value}",
+        require => File['/etc/sysconfig/pgsql/postgresql'],
+        notify  => Class['postgresql::server::service'],
+        before  => Class['postgresql::server::reload'],
+      }
+    } elsif $name == 'data_directory' {
+      # We need to force postgresql to stop before updating the data directory
+      # otherwise init script breaks
+      exec { "postgresql_${name}":
+        command => "service ${postgresql::server::service_name} stop",
+        onlyif  => "service ${postgresql::server::service_name} status",
+        unless  => "grep 'PGDATA=${value}' /etc/sysconfig/pgsql/postgresql",
+        path    => '/sbin:/bin:/usr/bin:/usr/local/bin',
+        require => File['/etc/sysconfig/pgsql/postgresql'],
+      }
+      -> augeas { 'override PGDATA in /etc/sysconfig/pgsql/postgresql':
+        lens    => 'Shellvars.lns',
+        incl    => '/etc/sysconfig/pgsql/postgresql',
+        context => '/files/etc/sysconfig/pgsql/postgresql',
+        changes => "set PGDATA ${value}",
+        require => File['/etc/sysconfig/pgsql/postgresql'],
+        notify  => Class['postgresql::server::service'],
+        before  => Class['postgresql::server::reload'],
       }
     }
   }

metadata.json

@@ -27,7 +27,8 @@
       "operatingsystemrelease": [
         "6",
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {

provision.yaml

@@ -37,6 +37,7 @@ release_checks_6:
   - redhat-6-x86_64
   - redhat-7-x86_64
   - redhat-8-x86_64
+  - redhat-9-x86_64
   - centos-6-x86_64
   - centos-7-x86_64
   - centos-8-x86_64
@@ -58,6 +59,7 @@ release_checks_7:
   images:
   - redhat-7-x86_64
   - redhat-8-x86_64
+  - redhat-9-x86_64
   - centos-7-x86_64
   - centos-8-x86_64
   - oracle-7-x86_64