projects
/
arvados-formula.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix ubuntu-18.04 gems and postgres versions
[arvados-formula.git]
/
test
/
salt
/
pillar
/
examples
/
postgresql.sls
diff --git
a/test/salt/pillar/examples/postgresql.sls
b/test/salt/pillar/examples/postgresql.sls
index 0bf33570e4de2205eeb037fc330d713f7616648e..a60b41f2f7e70b4e9df30a1e8ff4483d7f566315 100644
(file)
--- a/
test/salt/pillar/examples/postgresql.sls
+++ b/
test/salt/pillar/examples/postgresql.sls
@@
-5,21
+5,24
@@
### POSTGRESQL
postgres:
### POSTGRESQL
postgres:
- # Centos-7
's postgres package is
too old, so we need to force using upstream's
+ # Centos-7
and Ubuntu-18.04's postgres packages are
too old, so we need to force using upstream's
# This is not required in Debian's family as they already ship with PG +11
# This is not required in Debian's family as they already ship with PG +11
- {%- if salt['grains.get']('os
_family') == 'RedHat'
%}
+ {%- if salt['grains.get']('os
finger') in ['Ubuntu-18.04', 'CentOS Linux-7']
%}
use_upstream_repo: true
version: '12'
use_upstream_repo: true
version: '12'
+ {%- if salt['grains.get']('osfinger') == 'CentOS Linux-7' %}
pkgs_deps:
- libicu
- libxslt
- systemd-sysv
pkgs_deps:
- libicu
- libxslt
- systemd-sysv
-
pkgs_extra:
- postgresql12-contrib
pkgs_extra:
- postgresql12-contrib
+ {%- endif %}
+
{%- else %}
{%- else %}
+ use_upstream_repo: false
pkgs_extra:
- postgresql-contrib
{%- endif %}
pkgs_extra:
- postgresql-contrib
{%- endif %}