Implement review comment (conditional)

Author: noelmcloughlin

postgres/client/init.sls

@@ -39,9 +39,11 @@ postgresql-{{ bin }}-altinstall:
     - onlyif: test -f {{ path }}
     - require:
       - pkg: postgresql-client-libs
+      {%- if grains['saltversioninfo'] < [2018, 11, 0, 0] %}
     - retry:
         attempts: 2
         until: True
+      {%- endif %}
 
     {%- endfor %}
 {%- endif %}

postgres/dev/init.sls

@@ -23,14 +23,12 @@ postgresql-{{ bin }}-altinstall:
     - link: {{ salt['file.join']('/usr/bin', bin) }}
     - path: {{ path }}
     - priority: {{ postgres.linux.altpriority }}
-      {% if grains.os in ('Fedora', 'CentOS',) %} {# bypass bug #}
-    - onlyif: alternatives --display {{ bin }}
-      {% else %}
     - onlyif: test -f {{ path }}
+      {%- if grains['saltversioninfo'] < [2018, 11, 0, 0] %}
     - retry:
         attempts: 2
         until: True
-      {% endif %}
+      {%- endif %}
 
     {%- endfor %}
   {%- endif %}

postgres/server/init.sls

@@ -54,9 +54,11 @@ postgresql-{{ bin }}-altinstall:
       - pkg: postgresql-server
     - require_in:
       - cmd: postgresql-cluster-prepared
+        {%- if grains['saltversioninfo'] < [2018, 11, 0, 0] %}
     - retry:
         attempts: 2
         until: True
+        {%- endif %}
 
       {%- endfor %}
   {%- endif %}