Pārlūkot izejas kodu

Merge pull request #7 from elemoine/salt-version-test

[WIP] Fix the saltversion test
tags/2016.12
Adam Tengler pirms 8 gadiem
vecāks
revīzija
c651973691
1 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. +2
    -2
      salt/master/env.sls

+ 2
- 2
salt/master/env.sls Parādīt failu

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

Notiek ielāde…
Atcelt
Saglabāt