From 93dfb555284178eed6a35f7d68195ff96f499eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= <iwan.clement@free.fr>
Date: Mon, 30 Apr 2018 00:29:14 +0200
Subject: [PATCH] =?UTF-8?q?Mise=20en=20place=20du=20swapiness=20avec=20le?=
 =?UTF-8?q?=20bon=20module,=20et=20r=C3=A9activation=20dans=20le=20state?=
 =?UTF-8?q?=20global?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 linux/VMSwappiness.sls | 28 ++++++++++++----------------
 linux/init.sls         |  2 +-
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/linux/VMSwappiness.sls b/linux/VMSwappiness.sls
index 55c6ffc..c5e5f91 100644
--- a/linux/VMSwappiness.sls
+++ b/linux/VMSwappiness.sls
@@ -1,23 +1,19 @@
 {% if grains['kernel'] == 'Linux' %}
   {% if grains['virtual'] == 'qemu' %}
-  /etc/sysctl.conf:
-    file.append:
-      - makedirs: True
-      - text: vm.swappiness = 1
+  vm.swappiness:
+    sysctl.present:
+      - value: 1
   {% elif grains['virtual'] == 'LXC' %}
-  /etc/sysctl.conf:
-    file.append:
-      - makedirs: True
-      - text: vm.swappiness = 5
+  vm.swappiness:
+    sysctl.present:
+      - value: 5
   {% elif grains['os'] == 'Fedora' %}
-  /etc/sysctl.conf:
-    file.append:
-      - makedirs: True
-      - text: vm.swappiness = 10
+  vm.swappiness:
+    sysctl.present:
+      - value: 10
   {% elif grains['os'] == 'CentOS' %}
-  /etc/sysctl.conf:
-    file.append:
-      - makedirs: True
-      - text: vm.swappiness = 25
+  vm.swappiness:
+    sysctl.present:
+      - value: 25
   {% endif %}
 {% endif %}
diff --git a/linux/init.sls b/linux/init.sls
index 9148306..29926b5 100644
--- a/linux/init.sls
+++ b/linux/init.sls
@@ -1,6 +1,6 @@
 include:
   - linux.SSHPubKeys
-#  - linux.VMSwappiness
+  - linux.VMSwappiness
   - linux.LocalRepo
   - linux.MinionUpgrade
   - linux.MesPaquets