From 7d29899419fdf46523fbb068a644fb7aaaaef030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= <iwan@lescorpsdereve.space>
Date: Tue, 20 Nov 2018 11:41:06 +0000
Subject: [PATCH 1/3] =?UTF-8?q?Changement=20de=20l'URL=20de=20la=20cl?=
 =?UTF-8?q?=C3=A9=20pour=20Debian?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 softwares/docker-ce.sls | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/softwares/docker-ce.sls b/softwares/docker-ce.sls
index e9475ee..7f81d64 100644
--- a/softwares/docker-ce.sls
+++ b/softwares/docker-ce.sls
@@ -65,8 +65,9 @@ DockerCE Repository:
     - humanname: Docker-CE Repository
     - name: {{ LURL }}
     - file: /etc/apt/sources.list.d/docker-ce.list
-    - keyid: 0EBFCD88
-    - keyserver: keyserver.ubuntu.com
+    - key_url: https://download.docker.com/linux/debian/gpg
+#    - keyid: 0EBFCD88
+#    - keyserver: keyserver.ubuntu.com
   {% elif grains['os_family'] == 'RedHat' %}
     - baseurl: {{ LURL }}
     - humanname: docker-ce-stable

From 06a6352caadf4ed576a7ffa3a94fe0b0ff60d037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= <iwan@lescorpsdereve.space>
Date: Tue, 20 Nov 2018 12:40:36 +0000
Subject: [PATCH 2/3] Do it the salt way

---
 softwares/k8s.sls | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/softwares/k8s.sls b/softwares/k8s.sls
index f4a1e9e..263c714 100644
--- a/softwares/k8s.sls
+++ b/softwares/k8s.sls
@@ -68,9 +68,19 @@ Installons K8S sur machine de type RedHat:
   cmd.run:
     - name: 'yum install -y kubelet kubeadm kubectl --disableexcludes=kubernetes'
 
-Start K8S sur machine de type RedHat:
-  cmd.run:
-    - name: 'systemctl enable kubelet && systemctl start kubelet'
+# Start K8S sur machine de type RedHat:
+#   cmd.run:
+#     - name: 'systemctl enable kubelet && systemctl start kubelet'
+
+# Enable K8S sur machine de type RedHat:
+#   service.enabled:
+#     - enable: True
+#     - name: kubelet
+
+Start and enable K8S sur machine de type RedHat:
+  service.running:
+    - enable: True
+    - name: kubelet
 
   {% endif %}
 {% endif %}
\ No newline at end of file

From 4aa2869817abbfad78fa81f6c3a672f04e5a35f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= <iwan@lescorpsdereve.space>
Date: Tue, 20 Nov 2018 13:23:35 +0000
Subject: [PATCH 3/3] Disable swap

---
 softwares/k8s.sls | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/softwares/k8s.sls b/softwares/k8s.sls
index 263c714..3813da9 100644
--- a/softwares/k8s.sls
+++ b/softwares/k8s.sls
@@ -2,11 +2,15 @@
 include:
   - softwares.docker-ce
 
-Disable Swap:
+Disable Swap mount:
   mount.unmounted:
     - name: none
     - persist: True
 
+Disable Swap now:
+  cmd.run:
+    - name: 'swapoff -a'
+
 Remove K8S Repository:
   file.absent:
     - names: