Reorg

softwares/dockerCE.sls

@@ -18,17 +18,6 @@
           - docker-ce
           - docker-compose
 
-    CentOS docker Service running:
-      service.running:
-        - name: docker
-        - enable: True
-
-    CentOS Docker Group:
-      group.present:
-        - name: docker
-        - addusers:
-          - iwan
-
     {% elif grains['os'] == 'Fedora' %}
     Fedora Docker installation:
       pkg.installed:
@@ -48,8 +37,6 @@
           - iwan
     {% endif %}
   {% elif grains['os_family'] == 'Debian' %}
-    {% if grains['os'] == 'Debian' %}
-    {% set DEBVER = salt['grains.get']('oscodename') %}
   Debian Docker PreRequisites:
     pkg.installed:
       - pkgs:
@@ -58,6 +45,9 @@
         - curl
         - gnupg2
 
+    {% if grains['os'] == 'Debian' %}
+    {% set DEBVER = salt['grains.get']('oscodename') %}
+
     Debian Docker Add Repo:
       pkgrepo.managed:
         - name: deb [arch=amd64] https://download.docker.com/linux/debian {{DEBVER}} stable
@@ -78,16 +68,9 @@
           - pkgs:
             - docker
             - docker-compose
+
       {% else %}
       {% set UBUVER = salt['grains.get']('oscodename') %}
-      Ubuntu Docker PreRequisites:
-        pkg.installed:
-          - pkgs:
-            - apt-transport-https
-            - ca-certificates
-            - curl
-            - gnupg2
-
       Ubuntu Docker Add Repo:
         pkgrepo.managed:
           - name: deb [arch=amd64] https://download.docker.com/linux/ubuntu {{UBUVER}} stable
@@ -103,15 +86,16 @@
 
       {% endif %}
     {% endif %}
-  Debian docker Service running:
+  {% endif %}
+  Docker Service running:
     service.running:
       - name: docker
       - enable: True
 
-  Debian Docker Group:
+  Docker Group:
     group.present:
       - name: docker
       - addusers:
         - iwan
-  {% endif %}
+
 {% endif %}