From 59d76d19e641eccd0732ff671f89f4f9601b6cc3 Mon Sep 17 00:00:00 2001
From: Wolodja Wentland <w@babilen5.org>
Date: Wed, 17 Feb 2016 12:20:25 +0100
Subject: [PATCH] Revert "RedHat and FreeBSD support"

---
 nfs/client.sls    |  9 ---------
 nfs/files/exports |  2 +-
 nfs/map.jinja     | 25 +++++++------------------
 nfs/server.sls    | 15 +--------------
 4 files changed, 9 insertions(+), 42 deletions(-)

diff --git a/nfs/client.sls b/nfs/client.sls
index 68ecc3c..b3285e4 100644
--- a/nfs/client.sls
+++ b/nfs/client.sls
@@ -1,14 +1,5 @@
 {% from "nfs/map.jinja" import nfs with context %}
 
-{% if nfs.pkgs_client %}
 nfs-client-deps:
     pkg.installed:
         - pkgs: {{ nfs.pkgs_client|json }}
-{% endif %}
-
-{% if nfs.service_client %}
-nfs-service:
-  service.running:
-    - name: {{ nfs.service_client }}
-    - enable: True
-{% endif %}
diff --git a/nfs/files/exports b/nfs/files/exports
index 95c8622..5516c90 100644
--- a/nfs/files/exports
+++ b/nfs/files/exports
@@ -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 -%}
diff --git a/nfs/map.jinja b/nfs/map.jinja
index dbf9d3d..42cae3e 100644
--- a/nfs/map.jinja
+++ b/nfs/map.jinja
@@ -2,28 +2,17 @@
     'Ubuntu': {
         'pkgs_server': ['nfs-common', 'nfs-kernel-server'],
         'pkgs_client': ['nfs-common'],
-        'service_server': 'nfs-kernel-server',
-        'service_client': False,
+        'service_name': 'nfs-kernel-server'
     },
     'Debian': {
         'pkgs_server': ['nfs-common', 'nfs-kernel-server'],
         'pkgs_client': ['nfs-common'],
-        'service_server': 'nfs-kernel-server',
-        'service_client': False,
-    },
-    'FreeBSD': {
-        'pkgs_client': False,
-        'pkgs_server': False,
-        'service_server': 'nfsd',
-        'service_client': False,
-    },
-    'RedHat': {
-        'pkgs_server': ['nfs-utils'],
-        'pkgs_client': ['nfs-utils'],
-        'service_server_dependency': 'rpcbind',
-        'service_server': 'nfs',
-        'service_client': 'rpcbind',
-    },
+        'service_name': 'nfs-kernel-server'
+    }
 } %}
 
+{% if grains.get('saltversion', '').startswith('0.17') %}
 {% set nfs = salt['grains.filter_by'](map, merge=salt['pillar.get']('nfs:lookup'), base='default') %}
+{% else %}
+{% set nfs = map.get(grains.os) %}
+{% endif %}
diff --git a/nfs/server.sls b/nfs/server.sls
index 9973993..5e6b186 100644
--- a/nfs/server.sls
+++ b/nfs/server.sls
@@ -1,12 +1,8 @@
 {% 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:
@@ -15,16 +11,7 @@ nfs-server-deps:
     - watch_in:
       - service: nfs-service
 
-{# RedHat-based OSes requires to start rpcbind first
-    and in some versions there is a bug that it does not start as a dependency #}
-{% if nfs.service_server_dependency %}
-nfs-service-dependency:
-  service.running:
-    - name: {{ nfs.service_server_dependency }}
-    - enable: True
-{% endif %}
-
 nfs-service:
   service.running:
-    - name: {{ nfs.service_server }}
+    - name: {{ nfs.service_name }}
     - enable: True