Browse Source

enables use of jinja < 2.6

Commit 2b51a6f0c3 introduced options for gitfs_remotes in a pillar by using a jinja test to see if a parameter is a mapping (dict etc.). This feature however is only available in jinja 2.6 or newer (see http://jinja.pocoo.org/docs/dev/templates/#mapping).
Although this version of Jinja is available on Ubuntu, other OS / package managers do provide older versions (2.2.1 in RedHat 6).

This change makes use of the "iterable" test which should do the exact same thing.
tags/v0.57.0
Marvin Frick 10 years ago
parent
commit
868854c2e7
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      salt/files/master.d/_defaults.conf

+ 1
- 1
salt/files/master.d/_defaults.conf View File

@@ -484,7 +484,7 @@ fileserver_backend:
{% if 'gitfs_remotes' in master -%}
gitfs_remotes:
{%- for remote in master['gitfs_remotes'] %}
{% if remote is mapping %}
{% if remote is iterable %}
{%- for repo, children in remote.iteritems() -%}
- {{ repo }}:
{%- for child in children %}

Loading…
Cancel
Save