From dc163b78f54463014fa6c271f94a9afe95ebaee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= <iwan.clement@free.fr>
Date: Mon, 30 Apr 2018 13:55:35 +0200
Subject: [PATCH] =?UTF-8?q?Installation=20de=20docker=20avec=20tous=20les?=
 =?UTF-8?q?=20pr=C3=A9-requis.=20C'est=20peut-=C3=AAtre=20trop=20lourd=20!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 softwares/dockerCE.sls | 130 +++++++++++++++++++++--------------------
 1 file changed, 67 insertions(+), 63 deletions(-)

diff --git a/softwares/dockerCE.sls b/softwares/dockerCE.sls
index 071a5fa..42c32d1 100644
--- a/softwares/dockerCE.sls
+++ b/softwares/dockerCE.sls
@@ -1,72 +1,76 @@
-{% if grains['os_family'] == 'RedHat' %}
-  {% if grains['os'] == 'CentOS' %}
-  CentOS Docker PreRequisites:
-    pkg.installed:
-      - pkgs:
-        - yum-utils
-        - device-mapper-persistent-data
-        - lvm2
-
-  CentOS Docker Add Repo:
-    cmd.run:
-      - name: yum-config-manager -y --add-repo 'https://download.docker.com/linux/centos/docker-ce.repo'
-
-  CentOS Docker CE installation:
-    pkg.installed:
-      - pkgs:
-        - docker-ce
-
-  CentOS docker Service running:
-    service.running:
-      - name: docker
-      - enable: True
-
-  CentOS Docker Group:
-    group.present:
-      - name: docker
-      - addusers:
-        - iwan
-
-  {% endif %}
-{% elif grains['os_family'] == 'Debian' %}
-  {% if grains['os'] == 'Debian' %}
-  {% set DEBVER = salt['grains.get']('oscodename') %}
-  Debian Docker PreRequisites:
+{% if grains['kernel'] == 'Linux' %}
+include:
+  - linux.init
+  {% if grains['os_family'] == 'RedHat' %}
+    {% if grains['os'] == 'CentOS' %}
+    CentOS Docker PreRequisites:
       pkg.installed:
         - pkgs:
-          - apt-transport-https
-          - ca-certificates
-          - curl
-          - gnupg2
-#          - software-properties-common
-          - lsb-release
+          - yum-utils
+          - device-mapper-persistent-data
+          - lvm2
 
-  Debian Docker Add Repo:
-    pkgrepo.managed:
-#      - name: deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable
-      - name: deb [arch=amd64] https://download.docker.com/linux/debian {{DEBVER}} stable
-      - file: /etc/apt/sources.list.d/docker-ce.list
-      - enable: 1
-      - key_url: https://download.docker.com/linux/debian/gpg
-##    cmd.run:
-##      - name: curl -fsSL 'https://download.docker.com/linux/debian/gpg' | apt-key add -
-##      - name: add-apt-repository -y "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
+    CentOS Docker Add Repo:
+      cmd.run:
+        - name: yum-config-manager -y --add-repo 'https://download.docker.com/linux/centos/docker-ce.repo'
 
-  Debian Docker CE installation:
-    pkg.installed:
-      - pkgs:
-        - docker-ce
+    CentOS Docker CE installation:
+      pkg.installed:
+        - pkgs:
+          - docker-ce
 
-  Debian docker Service running:
-    service.running:
-      - name: docker
-      - enable: True
+    CentOS docker Service running:
+      service.running:
+        - name: docker
+        - enable: True
 
-  Debian Docker Group:
-    group.present:
-      - name: docker
-      - addusers:
-        - iwan
+    CentOS Docker Group:
+      group.present:
+        - name: docker
+        - addusers:
+          - iwan
 
+    {% endif %}
+  {% elif grains['os_family'] == 'Debian' %}
+    {% if grains['os'] == 'Debian' %}
+    {% set DEBVER = salt['grains.get']('oscodename') %}
+    Debian Docker PreRequisites:
+        pkg.installed:
+          - pkgs:
+            - apt-transport-https
+            - ca-certificates
+            - curl
+            - gnupg2
+#            - software-properties-common
+            - lsb-release
+
+    Debian Docker Add Repo:
+      pkgrepo.managed:
+#        - name: deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable
+        - name: deb [arch=amd64] https://download.docker.com/linux/debian {{DEBVER}} stable
+        - file: /etc/apt/sources.list.d/docker-ce.list
+        - enable: 1
+        - key_url: https://download.docker.com/linux/debian/gpg
+##      cmd.run:
+##        - name: curl -fsSL 'https://download.docker.com/linux/debian/gpg' | apt-key add -
+##        - name: add-apt-repository -y "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
+
+    Debian Docker CE installation:
+      pkg.installed:
+        - pkgs:
+          - docker-ce
+
+    Debian docker Service running:
+      service.running:
+        - name: docker
+        - enable: True
+
+    Debian Docker Group:
+      group.present:
+        - name: docker
+        - addusers:
+          - iwan
+
+    {% endif %}
   {% endif %}
 {% endif %}