search

saltstack-formulas / nfs-formula

http://docs.saltstack.com/en/latest/topics/development/conventions/formulas.html
Apache License 2.0
18 stars 83 forks source link

Simplified formula, removed legacy conditionals #22

Closed ixs closed 6 years ago

ixs commented 7 years ago

The maps.jinja code was suffering from some logic errors. The grains.filter_by code was only executed on the 0.17 salt versions rather than on 0.17 or newer. Considering that 0.17 is rather old, we can get rid of these cases and massively simplify the logic.

By defaulting to the Debian settings and using the os_family graint to filter by, the Ubuntu and Raspbian cases could be removed as well, further simplifying the map file.

Add rudimentary Red Hat support.

Have the pillar.get calls in mount.sls and unmount.sls return an empty default dict to make the SLS rendering not fail in case no pillar data is provided.

Remove support for pre 2015 saltversion unmount syntax.

aboe76 commented 6 years ago

@ixs are you happy with #25 fix?

ixs commented 6 years ago

@aboe76 Looks good to me. Closing this PR.