Merge branch 'master' of ssh://192.168.111.101:222/salt/states

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
+    - key_url: https://download.docker.com/linux/debian/gpg
-    - keyserver: keyserver.ubuntu.com
+#    - keyid: 0EBFCD88
+#    - keyserver: keyserver.ubuntu.com
   {% elif grains['os_family'] == 'RedHat' %}
     - baseurl: {{ LURL }}
     - humanname: docker-ce-stable

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:
@@ -68,9 +72,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:
+# Start K8S sur machine de type RedHat:
-  cmd.run:
+#   cmd.run:
-    - name: 'systemctl enable kubelet && systemctl start kubelet'
+#     - 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 %}