diff --git a/postgres/client/init.sls b/postgres/client/init.sls index 041c1057..839eecd0 100644 --- a/postgres/client/init.sls +++ b/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 %} diff --git a/postgres/dev/init.sls b/postgres/dev/init.sls index 20854065..b3e07b92 100644 --- a/postgres/dev/init.sls +++ b/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 %} diff --git a/postgres/server/init.sls b/postgres/server/init.sls index 2ef98dd7..cb3cdc31 100644 --- a/postgres/server/init.sls +++ b/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 %}