Implement review comment (conditional)

This commit is contained in:
N 2019-04-15 12:58:00 +01:00
parent 080bff7b3d
commit f3d8830177
No known key found for this signature in database
GPG key ID: 55A292EAB4E54067
3 changed files with 6 additions and 4 deletions

View file

@ -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 %}

View file

@ -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 %}

View file

@ -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 %}