fix(redhat): fix pkg_deps to be able to install PostgreSQL 13

saltstack-formulas · Jul 20, 2021 · 060c8df · 060c8df
1 parent 8a11bd6
commit 060c8df
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml
@@ -83,4 +83,12 @@
 {{ fedora_codename('Fedora-34', '13') }}
 {{ fedora_codename('Fedora-33', '13') }}
 
+## Amazon
+Amazon Linux 2:
+  pkgs_deps:
+    - libicu
+    - systemd-sysv
+  pkg_repo:
+    baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ repo.version }}/redhat/rhel-7-$basearch'
+
 # vim: ft=sls
diff --git a/postgres/osfamilymap.yaml b/postgres/osfamilymap.yaml
@@ -63,11 +63,12 @@ RedHat:
     gpgkey: 'https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-{{ release }}'
     baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ repo.version }}/redhat/rhel-$releasever-$basearch'
 
-{%- if grains.get('osmajorrelease', 0) >= 7 %}
   pkgs_deps:
     - libicu
+    {%- if grains.get('osmajorrelease', 0) == 7 %}
+    - systemd-sysv
+    {%- endif %}
   pkg_python: python3-psycopg2
-{%- endif %}
 
 {% if repo.use_upstream_repo == true %}
   {% set data_dir = '/var/lib/pgsql/' ~ repo.version ~ '/data' %}

diff --git a/postgres/osmap.yaml b/postgres/osmap.yaml
@@ -9,7 +9,3 @@ Fedora:
     baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ repo.version }}/fedora/fedora-$releasever-$basearch'
   remove:
     releases: ['9.4', '9.5', '9.6', '10']
-
-Amazon:
-  pkg_repo:
-    baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ repo.version }}/redhat/rhel-7-$basearch'