Merge branch 'master' of https://gitea.lescorpsdereve.space/salt/states

softwares/docker-ce.sls

@@ -1,7 +1,24 @@
 {% if grains['kernel'] == 'Linux' %}
+
+{% if grains['os'] == 'RedHat' %}
+SELinux for Redhat:
+  cmd.run:
+    - name: subscription-manager repos --enable=rhel-7-server-extras-rpms
+
+Pipons le python:
+  pkg.installed:
+  {% if grains['osmajorrelease'] == 6 %}
+    - name: python27-pip
+  {% else %}
+    - pkgs:
+      - python2-pip
+      - scl-utils
+  {% endif %}
+{% endif %}
+
 {% if grains['os'] == 'Debian' %}
   {% set LURL="deb [arch=amd64] https://download.docker.com/linux/debian " + grains['oscodename']+ " stable" %}
-{% elif grains['os'] == 'CentOS'%}
+{% elif grains['os_family'] == 'RedHat' %}
   {% set LURL='https://download.docker.com/linux/centos/' + grains['osmajorrelease']|string + '/$basearch/stable' %}
 {% endif %}
 RemovePreviousDocker:
@@ -30,7 +47,7 @@ DockerPrerequisitePackages:
       - ca-certificates
       - gnupg2
       - software-properties-common
-  {% elif grains['os'] == 'CentOS' %}
+  {% elif grains['os_family'] == 'RedHat' %}
       - yum-utils
       - device-mapper-persistent-data
       - lvm2
@@ -50,7 +67,7 @@ DockerCE Repository:
     - file: /etc/apt/sources.list.d/docker-ce.list
     - keyid: 0EBFCD88
     - keyserver: keyserver.ubuntu.com
-  {% elif grains['os'] == 'CentOS'%}
+  {% elif grains['os_family'] == 'RedHat' %}
     - baseurl: {{ LURL }}
     - humanname: docker-ce-stable
     - name: docker-ce
@@ -78,7 +95,7 @@ IwanDocker:
       - docker
   {% if grains['os'] == 'Debian' %}
       - sudo
-  {% elif grains['os'] == 'CentOS' %}
+  {% elif grains['os_family'] == 'RedHat' %}
       - wheel
   {% endif %}
 
@@ -90,6 +107,23 @@ Lets start docker:
   cmd.run:
     - name: systemctl start docker
 
+  {% if grains['os'] == 'RedHat' %}
+Upgrade pip:
+  cmd.run:
+    {% if grains['osmajorrelease'] == 7 %}
+    - name: "pip install --upgrade pip -i {{PIP_REPO_URL}} --trusted-host {{PIP_REPO_SERVER}}"
+    - env:
+      - LD_LIBRARY_PATH=/opt/rh/python27/root/usr/lib64:$LD_LIBRARY_PATH
+      - PATH=/opt/rh/python27/root/usr/bin:$PATH
+      - PKG_CONFIG_PATH=/opt/rh/python27/root/usr/lib64/pkgconfig
+      - XDG_DATA_DIRS=/opt/rh/python27/root/usr/share:$XDG_DATA_DIRS
+      - X_SCLS='python27 '
+    {% else %}
+    - name: "pip2.7 install --upgrade pip -i {{PIP_REPO_URL}} --trusted-host {{PIP_REPO_SERVER}}"
+    {% endif %}
+    - shell: /bin/bash
+  {% endif %}
+
 Lets install docker with pip:
   pip.installed:
     - name: docker

softwares/k8s.sls

@@ -1,6 +1,6 @@
 {% if grains['kernel'] == 'Linux' %}
 include:
-  - linux.docker-ce
+  - softwares.docker-ce
 
 Disable Swap:
   mount.unmounted: