Merge remote-tracking branch 'origin/freebsd_support'

This commit is contained in:
Alexander Kovtun 2016-02-04 15:05:10 +06:00
commit ca539ab885
3 changed files with 11 additions and 2 deletions

View file

@ -3,6 +3,6 @@
# Your changes will be overwritten.
########################################################################
#
{% for dir, opts in salt['pillar.get']('nfs:server:exports').items() -%}
{% for dir, opts in salt['pillar.get']('nfs:server:exports', {}).items() -%}
{{ dir }} {{ opts }}
{% endfor -%}

View file

@ -8,7 +8,12 @@
'pkgs_server': ['nfs-common', 'nfs-kernel-server'],
'pkgs_client': ['nfs-common'],
'service_name': 'nfs-kernel-server'
}
},
'FreeBSD': {
'pkgs_client': False,
'pkgs_server': False,
'service_name': 'nfsd'
},
} %}
{% if grains.get('saltversion', '').startswith('0.17') %}

View file

@ -1,8 +1,12 @@
{% from "nfs/map.jinja" import nfs with context %}
{# FreeBSD has everything needed for NFS w/o any
additional pkgs, so pkgs_server == False #}
{% if nfs.pkgs_server %}
nfs-server-deps:
pkg.installed:
- pkgs: {{ nfs.pkgs_server|json }}
{% endif %}
/etc/exports:
file.managed: