saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #460 from noelmcloughlin/version_cmp

Browse Source 
fix(jinja): replace version_cmp with grains lookup
This commit is contained in:
Imran Iqbal 2020-03-19 13:23:59 +00:00 committed by GitHub
commit 7551ba5b0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/formulas.sls
View File

@ -34,7 +34,7 @@
{%- do processed_basedirs.append(basedir) %} {%- do processed_basedirs.append(basedir) %}
{{ basedir }}: {{ basedir }}:
file.directory: file.directory:
- parallel: {{ salt.pkg.version_cmp(grains['saltversion'], '2017.7.0') >= 0 }} - parallel: {{ grains['saltversioninfo'] >= [2017, 7, 0] }}
{%- for key, value in salt['pillar.get']('salt_formulas:basedir_opts', {%- for key, value in salt['pillar.get']('salt_formulas:basedir_opts',
{'makedirs': True}).items() %} {'makedirs': True}).items() %}
- {{ key }}: {{ value }} - {{ key }}: {{ value }}
@ -54,7 +54,7 @@
{{ gitdir_env }}: {{ gitdir_env }}:
git.latest: git.latest:
- name: {{ baseurl }}/{{ f_name }}.git - name: {{ baseurl }}/{{ f_name }}.git
- parallel: {{ salt.pkg.version_cmp(grains['saltversion'], '2017.7.0') >= 0 }} - parallel: {{ grains['saltversioninfo'] >= [2017, 7, 0] }}
- target: {{ gitdir }} - target: {{ gitdir }}
{%- for key, value in options.items() %} {%- for key, value in options.items() %}
- {{ key }}: {{ value }} - {{ key }}: {{ value }}

2
test/integration/v201902-py3/controls/pkgs_spec.rb
View File

@ -12,7 +12,7 @@ version =
when 'fedora' when 'fedora'
'2019.2.1rc0-3.fc31' '2019.2.1rc0-3.fc31'
when 'suse' when 'suse'
'2019.2.0-lp151.5.9.1' '2019.2.0-lp151.5.12.1'
when 'debian' when 'debian'
'2019.2.3+ds-1' '2019.2.3+ds-1'
end end