From 936c9908095bfa30aba9df3234855b5a9539927b Mon Sep 17 00:00:00 2001
From: Enver <enver@personal.com>
Date: Thu, 11 Feb 2016 15:16:46 +0100
Subject: [PATCH 1/3] Added support for dictionary params (params2)

---
 pillar.example   |  7 +++++++
 sysctl/param.sls | 28 +++++++++++++++++++++++-----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/pillar.example b/pillar.example
index 21b0061..a311ee7 100644
--- a/pillar.example
+++ b/pillar.example
@@ -11,3 +11,10 @@ sysctl:
       - 
         name: vm.swappiness
         value: 20
+    # Setting params2 excludes all params values
+    params2:
+      fs.file-max:
+        value: 100000
+        config: fs.conf
+      vm.swappiness:
+        value: 20
\ No newline at end of file
diff --git a/sysctl/param.sls b/sysctl/param.sls
index ae1bb99..f1ffa57 100644
--- a/sysctl/param.sls
+++ b/sysctl/param.sls
@@ -4,14 +4,32 @@
 {## import settings from map.jinja ##}
 {% from "sysctl/map.jinja" import sysctl_settings with context %}
 
-{% for param in  sysctl_settings.get('params', {}) %}
-  {% if param is mapping %}
+{% if sysctl_settings.get('params2', '') != '' %}
+
+  {% for param_name, param in sysctl_settings.get('params2', {}).items() %}
+    {% if param is mapping %}
+sysctl-present-{{ param_name }}:
+  sysctl.present:
+    - name: {{ param_name }}
+    - value: {{ param.value }}
+      {% if param.config is defined %}
+    - config: {{ sysctl_settings.config.location }}/{{ param.config }}
+      {% endif %}
+    {% endif %}
+  {% endfor %}
+
+{% else %}
+
+  {% for param in  sysctl_settings.get('params', {}) %}
+    {% if param is mapping %}
 sysctl-present-{{ param.name }}:
   sysctl.present:
     - name: {{ param.name }}
     - value: {{ param.value }}
-    {% if param.config is defined %}
+      {% if param.config is defined %}
     - config: {{ sysctl_settings.config.location }}/{{ param.config }}
+      {% endif %}
     {% endif %}
-  {% endif %}
-{% endfor %}
+  {% endfor %}
+
+{% endif %}

From 35792ec351ac2a92269b43c102df7c8405374e02 Mon Sep 17 00:00:00 2001
From: Enver <enver@personal.com>
Date: Thu, 11 Feb 2016 15:23:15 +0100
Subject: [PATCH 2/3] Make it pretty

---
 sysctl/param.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysctl/param.sls b/sysctl/param.sls
index f1ffa57..39287e2 100644
--- a/sysctl/param.sls
+++ b/sysctl/param.sls
@@ -4,7 +4,7 @@
 {## import settings from map.jinja ##}
 {% from "sysctl/map.jinja" import sysctl_settings with context %}
 
-{% if sysctl_settings.get('params2', '') != '' %}
+{% if sysctl_settings.params2 is defined %}
 
   {% for param_name, param in sysctl_settings.get('params2', {}).items() %}
     {% if param is mapping %}

From 4a5eec75d768132d0952cc45e9382ba26e22567c Mon Sep 17 00:00:00 2001
From: Enver <enver@personal.com>
Date: Fri, 12 Feb 2016 09:42:31 +0100
Subject: [PATCH 3/3] Incorporated suggestions after initial PR review

---
 sysctl/param.sls | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/sysctl/param.sls b/sysctl/param.sls
index 39287e2..9e510d1 100644
--- a/sysctl/param.sls
+++ b/sysctl/param.sls
@@ -2,34 +2,34 @@
 # vim: ft=sls
 
 {## import settings from map.jinja ##}
-{% from "sysctl/map.jinja" import sysctl_settings with context %}
+{%- from "sysctl/map.jinja" import sysctl_settings with context -%}
 
-{% if sysctl_settings.params2 is defined %}
+{%- if sysctl_settings.params2 is defined -%}
 
-  {% for param_name, param in sysctl_settings.get('params2', {}).items() %}
-    {% if param is mapping %}
+  {%- for param_name, param in sysctl_settings.get('params2', {}).items() -%}
+    {%- if param is mapping %}
 sysctl-present-{{ param_name }}:
   sysctl.present:
     - name: {{ param_name }}
     - value: {{ param.value }}
-      {% if param.config is defined %}
+      {%- if param.config is defined %}
     - config: {{ sysctl_settings.config.location }}/{{ param.config }}
-      {% endif %}
-    {% endif %}
+      {% endif -%}
+    {% endif -%}
   {% endfor %}
 
 {% else %}
 
-  {% for param in  sysctl_settings.get('params', {}) %}
-    {% if param is mapping %}
+  {%- for param in  sysctl_settings.get('params', {}) -%}
+    {%- if param is mapping %}
 sysctl-present-{{ param.name }}:
   sysctl.present:
     - name: {{ param.name }}
     - value: {{ param.value }}
-      {% if param.config is defined %}
+      {%- if param.config is defined %}
     - config: {{ sysctl_settings.config.location }}/{{ param.config }}
-      {% endif %}
-    {% endif %}
+      {% endif -%}
+    {% endif -%}
   {% endfor %}
 
-{% endif %}
+{%- endif -%}