Browse Source

Fix the saltversion test

tags/2016.12
Éric Lemoine 8 years ago
parent
commit
0b33d6717e
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      salt/master/env.sls

+ 2
- 2
salt/master/env.sls View File

- target: /usr/share/salt-formulas/env/_formulas/{{ formula_name }} - target: /usr/share/salt-formulas/env/_formulas/{{ formula_name }}
{% if formula.get("revision", "").split("/")[0] == "refs" %} {% if formula.get("revision", "").split("/")[0] == "refs" %}
- rev: {{ formula.branch|default("master") }} - rev: {{ formula.branch|default("master") }}
{%- if grains['saltversion'] < "2015.8.0" %}
{%- if grains['saltversion'] >= "2015.8.0" %}
- branch: {{ formula.branch|default("master") }} - branch: {{ formula.branch|default("master") }}
{%- endif %} {%- endif %}
{% else %} {% else %}
- rev: {{ formula.revision|default(formula.branch) }} - rev: {{ formula.revision|default(formula.branch) }}
{%- if grains['saltversion'] < "2015.8.0" %}
{%- if grains['saltversion'] >= "2015.8.0" %}
- branch: {{ formula.branch|default(formula.revision) }} - branch: {{ formula.branch|default(formula.revision) }}
{%- endif %} {%- endif %}
{% endif %} {% endif %}

Loading…
Cancel
Save