mirror of
https://github.com/saltstack-formulas/postgres-formula.git
synced 2025-04-17 10:10:31 +00:00
Implement review comment (conditional)
This commit is contained in:
parent
080bff7b3d
commit
f3d8830177
3 changed files with 6 additions and 4 deletions
|
@ -39,9 +39,11 @@ postgresql-{{ bin }}-altinstall:
|
||||||
- onlyif: test -f {{ path }}
|
- onlyif: test -f {{ path }}
|
||||||
- require:
|
- require:
|
||||||
- pkg: postgresql-client-libs
|
- pkg: postgresql-client-libs
|
||||||
|
{%- if grains['saltversioninfo'] < [2018, 11, 0, 0] %}
|
||||||
- retry:
|
- retry:
|
||||||
attempts: 2
|
attempts: 2
|
||||||
until: True
|
until: True
|
||||||
|
{%- endif %}
|
||||||
|
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
|
@ -23,14 +23,12 @@ postgresql-{{ bin }}-altinstall:
|
||||||
- link: {{ salt['file.join']('/usr/bin', bin) }}
|
- link: {{ salt['file.join']('/usr/bin', bin) }}
|
||||||
- path: {{ path }}
|
- path: {{ path }}
|
||||||
- priority: {{ postgres.linux.altpriority }}
|
- priority: {{ postgres.linux.altpriority }}
|
||||||
{% if grains.os in ('Fedora', 'CentOS',) %} {# bypass bug #}
|
|
||||||
- onlyif: alternatives --display {{ bin }}
|
|
||||||
{% else %}
|
|
||||||
- onlyif: test -f {{ path }}
|
- onlyif: test -f {{ path }}
|
||||||
|
{%- if grains['saltversioninfo'] < [2018, 11, 0, 0] %}
|
||||||
- retry:
|
- retry:
|
||||||
attempts: 2
|
attempts: 2
|
||||||
until: True
|
until: True
|
||||||
{% endif %}
|
{%- endif %}
|
||||||
|
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
|
@ -54,9 +54,11 @@ postgresql-{{ bin }}-altinstall:
|
||||||
- pkg: postgresql-server
|
- pkg: postgresql-server
|
||||||
- require_in:
|
- require_in:
|
||||||
- cmd: postgresql-cluster-prepared
|
- cmd: postgresql-cluster-prepared
|
||||||
|
{%- if grains['saltversioninfo'] < [2018, 11, 0, 0] %}
|
||||||
- retry:
|
- retry:
|
||||||
attempts: 2
|
attempts: 2
|
||||||
until: True
|
until: True
|
||||||
|
{%- endif %}
|
||||||
|
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
Loading…
Add table
Reference in a new issue