From cb2819d670d0a579bfde668a709090a3090f066e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= Date: Mon, 12 Nov 2018 16:21:26 +0000 Subject: [PATCH 1/9] Path update --- softwares/k8s.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/softwares/k8s.sls b/softwares/k8s.sls index e646494..800c425 100644 --- a/softwares/k8s.sls +++ b/softwares/k8s.sls @@ -1,6 +1,6 @@ {% if grains['kernel'] == 'Linux' %} include: - - linux.docker-ce + - softwares.docker-ce Remove K8S Repository: file.absent: From 6e7859f2131cc76e29e7ee28a04933f0d6d9778a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= Date: Tue, 13 Nov 2018 09:23:20 +0000 Subject: [PATCH 2/9] os => os_family RedHat --- softwares/docker-ce.sls | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/softwares/docker-ce.sls b/softwares/docker-ce.sls index c3634be..b209bba 100644 --- a/softwares/docker-ce.sls +++ b/softwares/docker-ce.sls @@ -30,7 +30,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 +50,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 +78,7 @@ IwanDocker: - docker {% if grains['os'] == 'Debian' %} - sudo - {% elif grains['os'] == 'CentOS' %} + {% elif grains['os_family'] == 'RedHat' %} - wheel {% endif %} From 216279fbe2c66296e26c568e672329874b3788c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= Date: Tue, 13 Nov 2018 09:25:56 +0000 Subject: [PATCH 3/9] Centos Repo for RedHat --- softwares/docker-ce.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/softwares/docker-ce.sls b/softwares/docker-ce.sls index b209bba..12b591c 100644 --- a/softwares/docker-ce.sls +++ b/softwares/docker-ce.sls @@ -1,7 +1,7 @@ {% if grains['kernel'] == 'Linux' %} {% 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: From dd5f26e4909161aa7718a6f8f0a8065bafe701c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= Date: Tue, 13 Nov 2018 10:04:28 +0000 Subject: [PATCH 4/9] Enable repo for RedHat --- softwares/docker-ce.sls | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/softwares/docker-ce.sls b/softwares/docker-ce.sls index 12b591c..9eb1989 100644 --- a/softwares/docker-ce.sls +++ b/softwares/docker-ce.sls @@ -1,4 +1,11 @@ {% if grains['kernel'] == 'Linux' %} + +{% if grains['os'] == 'RedHat' %} +SELinux for Redhat: + cmd.run: + - name: subscription-manager repos --enable=rhel-7-server-extras-rpms +{% endif %} + {% if grains['os'] == 'Debian' %} {% set LURL="deb [arch=amd64] https://download.docker.com/linux/debian " + grains['oscodename']+ " stable" %} {% elif grains['os_family'] == 'RedHat' %} From 92e359179b16d632aeb9543a172f8677fc6ebf40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= Date: Tue, 13 Nov 2018 10:50:38 +0000 Subject: [PATCH 5/9] Avec un bon pip --- softwares/docker-ce.sls | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/softwares/docker-ce.sls b/softwares/docker-ce.sls index 9eb1989..2847167 100644 --- a/softwares/docker-ce.sls +++ b/softwares/docker-ce.sls @@ -4,6 +4,34 @@ SELinux for Redhat: cmd.run: - name: subscription-manager repos --enable=rhel-7-server-extras-rpms + +Repo for PIP on RHEL: + cmd.run: + - name: subscription-manager repos --enable rhel-server-rhscl-7-rpms + +Pipons le python: + pkg.installed: + {% if grains['osmajorrelease'] == 6 %} + - name: python27-pip + {% else %} + - pkgs: + - python27-python-pip + - scl-utils + {% endif %} + +# 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 %} {% endif %} {% if grains['os'] == 'Debian' %} From 3fb6377d3db7f14e7ba6d7a64514716fcc34b6a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= Date: Tue, 13 Nov 2018 10:53:58 +0000 Subject: [PATCH 6/9] =?UTF-8?q?On=20enl=C3=A8ve=20le=20surplus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- softwares/docker-ce.sls | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/softwares/docker-ce.sls b/softwares/docker-ce.sls index 2847167..b10541a 100644 --- a/softwares/docker-ce.sls +++ b/softwares/docker-ce.sls @@ -18,20 +18,6 @@ Pipons le python: - python27-python-pip - scl-utils {% endif %} - -# 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 %} {% endif %} {% if grains['os'] == 'Debian' %} From 6ad9b49c18705e613145488c970b70dc6ca578b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= Date: Tue, 13 Nov 2018 13:12:50 +0000 Subject: [PATCH 7/9] Le bon pip --- softwares/docker-ce.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/softwares/docker-ce.sls b/softwares/docker-ce.sls index b10541a..868ad4e 100644 --- a/softwares/docker-ce.sls +++ b/softwares/docker-ce.sls @@ -15,7 +15,7 @@ Pipons le python: - name: python27-pip {% else %} - pkgs: - - python27-python-pip + - python2-pip - scl-utils {% endif %} {% endif %} From b32eb970c4958e5d76857b5b4ed88ccc80b79ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= Date: Tue, 13 Nov 2018 13:20:43 +0000 Subject: [PATCH 8/9] On supprime le mauvais REPO --- softwares/docker-ce.sls | 4 ---- 1 file changed, 4 deletions(-) diff --git a/softwares/docker-ce.sls b/softwares/docker-ce.sls index 868ad4e..562e5b5 100644 --- a/softwares/docker-ce.sls +++ b/softwares/docker-ce.sls @@ -5,10 +5,6 @@ SELinux for Redhat: cmd.run: - name: subscription-manager repos --enable=rhel-7-server-extras-rpms -Repo for PIP on RHEL: - cmd.run: - - name: subscription-manager repos --enable rhel-server-rhscl-7-rpms - Pipons le python: pkg.installed: {% if grains['osmajorrelease'] == 6 %} From 523487feb58aab192f2576493d22e04ffc493be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iwan=20Cl=C3=A9ment?= Date: Tue, 13 Nov 2018 13:32:19 +0000 Subject: [PATCH 9/9] Upgrade PIP for RHEL --- softwares/docker-ce.sls | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/softwares/docker-ce.sls b/softwares/docker-ce.sls index 562e5b5..2321454 100644 --- a/softwares/docker-ce.sls +++ b/softwares/docker-ce.sls @@ -107,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