Merge pull request #22 from galaxyproject/el-repo-changes

Additional fixes for yum repo changes upstream

Author: natefoo

tasks/redhat.yml

@@ -1,5 +1,10 @@
 ---
 
+- name: Set PostgreSQL dotless version fact
+  set_fact:
+    __postgresql_version_dotless: "{{ postgresql_version | replace('.', '') }}"
+    __postgresql_command_sep: "{{ postgresql_version is version('10', '>=') | ternary('-', '') }}"
+
 # Using the rpm URL format of the yum module causes Ansible to download the rpm
 # every time to check whether it's installed, so, don't do that.
 - name: Check pgdg repository package (RedHat)
@@ -8,43 +13,38 @@
   register: __postgresql_repo_pkg_installed_result
   ignore_errors: yes
 
-# URLs for Fedora look like (line split for linting purposes):
-#   http://yum.postgresql.org/<pg_version>/fedora/fedora-<os_major_version>-<arch>
-#     /pgdg-fedora<pg_version_without_period>-<pg_version>-<rpm_release_version>.noarch.rpm
-# URLs for RedHat and all derivatives look like:
-#   http://yum.postgresql.org/<pg_version>/redhat/rhel-<os_major_version>-<arch>
-#     /pgdg-<dist><pg_version_without_period>-<pg_version>-<rpm_release_version>.noarch.rpm
-
-# There's no direct way to determine the latest pacakge, so we have to use a
-# helper script to parse the directory list and figure it out.
-- name: Determine latest pgdg repository package (RedHat)
-  script: >-
-    get_repo_rpm_release.py
-    http://yum.postgresql.org/{{ postgresql_version }}/{{ postgresql_pgdg_families[ansible_distribution]
-      | default("redhat") }}/{{ postgresql_pgdg_shortfamilies[ansible_distribution]
-      | default("rhel") }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}/ {{
-        postgresql_pgdg_dists[ansible_distribution]
-      }}
-  register: __postgresql_pgdg_repo_pkg_name_result
-  when: __postgresql_repo_pkg_installed_result is failed
-
 - name: Install pgdg repository package (RedHat)
   yum:
     name: >-
-      http://yum.postgresql.org/{{ postgresql_version }}/{{ postgresql_pgdg_families[ansible_distribution]
-        | default("redhat") }}/{{ postgresql_pgdg_shortfamilies[ansible_distribution]
-        | default("rhel") }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}/{{
-          __postgresql_pgdg_repo_pkg_name_result.stdout.strip()
-        }}
+      https://download.postgresql.org/pub/repos/yum/reporpms/{{ postgresql_pgdg_shortfamilies[ansible_distribution]
+        | default("EL") }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}/pgdg-{{
+        postgresql_pgdg_families[ansible_distribution] | default("redhat") }}-repo-latest.noarch.rpm
   register: __postgresql_yum_result
   until: __postgresql_yum_result is succeeded
   retries: 5
   delay: 5
   when: __postgresql_repo_pkg_installed_result is failed
 
+#- name: Collect installed repos
+#  yum:
+#    list: repos
+#  until: __postgresql_yum_repolist_result is succeeded
+#  retries: 5
+#  delay: 5
+#  register: __postgresql_yum_repolist_result
+
+# Not supported (and no good workaround) until there is a solution for https://github.com/ansible/ansible/issues/41178
+#- name: Ensure that only the desired PostgreSQL version's repo is enabled
+#  yum_repository:
+#    name: item.repoid
+#    enabled: "{{ (item.repoid == 'pgdg' ~ __postgresql_version_dotless) if item.repoid.startswith('pgdg') else item.state == 'enabled' }}"
+#  # "{{ __postgresql_yum_repolist_result.results | selectattr('repoid', 'startswith', 'pgdg') | list }}" would be nice
+#  # here but alas there is no `startswith` test
+#  loop: "{{ __postgresql_yum_repolist_result.results }}"
+
 - name: Install PostgreSQL (RedHat)
   yum:
-    name: postgresql{{ postgresql_version | replace('.', '') }}-server
+    name: postgresql{{ __postgresql_version_dotless }}-server
 
 - name: Check for pgdata directory
   stat:
@@ -57,14 +57,13 @@
   args:
     warn: false  # Use of /sbin/service is valid here, ignore lint error
   when: >-
-    ansible_distribution_major_version | int < 7
+    ansible_distribution_major_version is version(7, '<')
       and (pgdata_stat.stat.isdir is not defined or not pgdata_stat.stat.isdir)
 
 - name: Initialize database (RedHat >= 7)
   command: >-
-    /usr/pgsql-{{ postgresql_version }}/bin/postgresql{{
-      '-' if postgresql_version is version_compare('10', '>=') else '' }}{{
-      postgresql_version | replace('.', '') }}-setup initdb
+    /usr/pgsql-{{ postgresql_version }}/bin/postgresql{{ __postgresql_command_sep }}{{
+      __postgresql_version_dotless }}-setup initdb
   when: >-
-    ansible_distribution_major_version | int >= 7
+    ansible_distribution_major_version is version(7, '>=')
       and (pgdata_stat.stat.isdir is not defined or not pgdata_stat.stat.isdir)

vars/main.yml

@@ -1,15 +1,10 @@
 ---
 
-# maps ansible_distribution to the pgdg repository package name
-postgresql_pgdg_dists:
-  RedHat: redhat
-  CentOS: centos
-  Scientific: sl
-  SLC: sl
-  OracleLinux: oraclelinux
-
+# maps ansible_* to the pgdg repository package name
 postgresql_pgdg_families:
+  #default: redhat
   Fedora: fedora
 
 postgresql_pgdg_shortfamilies:
-  Fedora: fedora
+  #default: EL
+  Fedora: F