Merge pull request #219 from noelmcloughlin/better_jinja_syntax

Improve Jinja2 syntax in repo.yaml
This commit is contained in:
N 2018-06-12 09:20:05 +01:00 committed by GitHub
commit d9c071a547
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -9,8 +9,8 @@ fromrepo: {{ salt['pillar.get']('postgres:fromrepo', defaults.postgres.fromrepo)
#Early lookup for system user on MacOS #Early lookup for system user on MacOS
{% if grains.os == 'MacOS' %} {% if grains.os == 'MacOS' %}
{% set sysuser = salt['pillar.get']('postgres.user') or salt['cmd.run']("stat -f '%Su' /dev/console") %} {% set sysuser = salt['pillar.get']('postgres.user', salt['cmd.run']("stat -f '%Su' /dev/console")) %}
{% set sysgroup = salt['pillar.get']('postgres.group') or salt['cmd.run']("stat -f '%Sg' /dev/console") %} {% set sysgroup = salt['pillar.get']('postgres.group', salt['cmd.run']("stat -f '%Sg' /dev/console")) %}
user: {{ sysuser }} user: {{ sysuser }}
group: {{ sysgroup }} group: {{ sysgroup }}
{% endif %} {% endif %}