Browse Source
Merge pull request #7 from elemoine/salt-version-test
[WIP] Fix the saltversion testtags/2016.12
Adam Tengler
8 years ago
1 changed files with 2 additions and 2 deletions
+ 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…