fix(jinja): replace version_cmp with grains lookup

[noelmcloughlin]

PR progress checklist (to be filled in by reviewers)

• Changes to documentation are appropriate (or tick if not required)
• Changes to tests are appropriate (or tick if not required)
• Reviews completed

---

What type of PR is this?

Primary type

• [build] Changes related to the build system
• [chore] Changes to the build process or auxiliary tools and libraries such as documentation generation
• [ci] Changes to the continuous integration configuration
• [feat] A new feature
• [fix] A bug fix
• [perf] A code change that improves performance
• [refactor] A code change that neither fixes a bug nor adds a feature
• [revert] A change used to revert a previous commit
• [style] Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)

Secondary type

• [docs] Documentation changes
• [test] Adding missing or correcting existing tests

Does this PR introduce a BREAKING CHANGE?

No.

Related issues and/or pull requests

Fixes #459

Describe the changes you're proposing

Use grains, more portable anyway

Pillar / config required to test the proposed changes

salt_formulas:
  git_opts:
    default:
      baseurl: https://github.com/saltstack-formulas
         {%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
      basedir: /usr/local/etc/salt/states/namespaces/saltstack-formulas
         {%- else %}
      basedir: /srv/salt/namespaces/saltstack-formulas
         {%- endif %}
  basedir_opts:
    makedirs: True
    user: root
      {%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
    group: wheel
      {%- else %}
    group: root
      {%- endif %}
    mode: 755
  minion_conf:
    create_from_list: True
  list:
    base:
     {{ '- epel-formula' if grains.os_family in ('RedHat',) else '' }}
     - salt-formula

Debug log showing how the proposed changes work

Documentation checklist

• Updated the README (e.g. Available states).
• Updated pillar.example.

Testing checklist

• Included in Kitchen (i.e. under state_top).
• Covered by new/existing tests (e.g. InSpec, Serverspec, etc.).
• Updated the relevant test pillar.

Additional context

[myii]

@noelmcloughlin Thanks for this PR, please also include the change for pkg.version_cmp here:

salt-formula/salt/formulas.sls

Line 57 in b7d323f

- parallel: {{ salt.pkg.version_cmp(grains['saltversion'], '2017.7.0') >= 0 }}

[noelmcloughlin]

Added commit to failed Suse travis job

     ✔  System Package salt-master version is expected to eq "2019.2.0-lp151.5.12.1"
     ✔  System Package salt-minion is expected to be installed
     ✔  System Package salt-minion version is expected to eq "2019.2.0-lp151.5.12.1"

[noelmcloughlin]

@noelmcloughlin Thanks for this PR, please also include the change for pkg.version_cmp here:

Thanks @myii, I added commit to fix that line.

[myii]

Closes #459.

[myii]

Merged, thanks @noelmcloughlin.

[noelmcloughlin]

Thanks, @myii much appreicated.

[saltstack-formulas-travis]

🎉 This PR is included in version 1.3.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀