21361: Remove CentOS 7 exceptions from Salt installer

This does leave behind some exceptions that look like they're for CentOS
7 but I believe are meant to be exceptions for Red Hat-family distros
generally. That refinement can happen as part of #21425.

Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith@curii.com>

diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/arvados.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/arvados.sls
index 275c2c78ab7ac81bfa106a3da0d8949838c366d6..271ab502908578c70a7373787cb0d29213a576f5 100644 (file)
--- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/arvados.sls
+++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/arvados.sls
@@ -77,13 +77,6 @@ arvados:
       user: {{ database_user }}
       extra_conn_params:
         client_encoding: UTF8
-      # Centos7 does not enable SSL by default, so we disable
-      # it here just for testing of the formula purposes only.
-      # You should not do this in production, and should
-      # configure Postgres certificates correctly
-      {%- if grains.os_family in ('RedHat',) %}
-        sslmode: disable
-      {%- endif %}
 
     tls:
       # certificate: ''

diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/postgresql.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/postgresql.sls
index edb961ebaaeccca0899d0c2633ca7c0957369805..ade544764a9e8aa35269bc33669fa4a0833ebb13 100644 (file)
--- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/postgresql.sls
+++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/postgresql.sls
@@ -5,25 +5,9 @@
 
 ### POSTGRESQL
 postgres:
-  # Centos-7's postgres package is too old, so we need to force using upstream's
-  # This is not required in Debian's family as they already ship with PG +11
-  {%- if salt['grains.get']('os_family') == 'RedHat' %}
-  use_upstream_repo: true
-  version: '12'
-
-  pkgs_deps:
-    - libicu
-    - libxslt
-    - systemd-sysv
-
-  pkgs_extra:
-    - postgresql12-contrib
-
-  {%- else %}
   use_upstream_repo: false
   pkgs_extra:
     - postgresql-contrib
-  {%- endif %}
   postgresconf: |-
     listen_addresses = '*'  # listen on all interfaces
     #ssl = on

diff --git a/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls b/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls
index f83984b01a93c0d6851470f6b8740370f23f7a63..9e3a293110afaa76c0ad3d9ca27300174747a287 100644 (file)
--- a/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls
+++ b/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls
@@ -77,13 +77,6 @@ arvados:
       user: {{ database_user }}
       extra_conn_params:
         client_encoding: UTF8
-      # Centos7 does not enable SSL by default, so we disable
-      # it here just for testing of the formula purposes only.
-      # You should not do this in production, and should
-      # configure Postgres certificates correctly
-      {%- if grains.os_family in ('RedHat',) %}
-        sslmode: disable
-      {%- endif %}
 
     tls:
       # certificate: ''

diff --git a/tools/salt-install/config_examples/single_host/single_hostname/pillars/postgresql.sls b/tools/salt-install/config_examples/single_host/single_hostname/pillars/postgresql.sls
index 14452a990541bf47fee379a33345895f6652cbd8..82a4f7120a68d41f8a1a188cbec46c5743573f8c 100644 (file)
--- a/tools/salt-install/config_examples/single_host/single_hostname/pillars/postgresql.sls
+++ b/tools/salt-install/config_examples/single_host/single_hostname/pillars/postgresql.sls
@@ -5,25 +5,9 @@
 
 ### POSTGRESQL
 postgres:
-  # Centos-7's postgres package is too old, so we need to force using upstream's
-  # This is not required in Debian's family as they already ship with PG +11
-  {%- if salt['grains.get']('os_family') == 'RedHat' %}
-  use_upstream_repo: true
-  version: '12'
-
-  pkgs_deps:
-    - libicu
-    - libxslt
-    - systemd-sysv
-
-  pkgs_extra:
-    - postgresql12-contrib
-
-  {%- else %}
   use_upstream_repo: false
   pkgs_extra:
     - postgresql-contrib
-  {%- endif %}
   postgresconf: |-
     listen_addresses = '*'  # listen on all interfaces
     # If you want to enable communications' encryption to the DB server,