From 28c5de30dc667d6c688671fce12faa03f7f30545 Mon Sep 17 00:00:00 2001 From: micafer Date: Fri, 3 Jul 2020 10:53:18 +0200 Subject: [PATCH 1/8] Fix ubuntu 20 --- contextualization/conf-ansible.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/contextualization/conf-ansible.yml b/contextualization/conf-ansible.yml index 040ea0a3b..07bb6d6dc 100644 --- a/contextualization/conf-ansible.yml +++ b/contextualization/conf-ansible.yml @@ -68,6 +68,13 @@ ################### Install Ansible/pip requisites ######################### + - name: Make sure universe repository is enabled in Ubuntu 20+ + apt_repository: + repo: deb http://archive.ubuntu.com/ubuntu {{ansible_distribution_release}} universe + state: present + update_cache: True + when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 20 + - name: Debian/Ubuntu install requisites with apt apt: name=python-pip,python-setuptools,sshpass,openssh-client,unzip install_recommends=no when: ansible_os_family == "Debian" From 6b046f40be13c0ea0c59f1e338dbe77c2c877559 Mon Sep 17 00:00:00 2001 From: micafer Date: Fri, 3 Jul 2020 11:47:19 +0200 Subject: [PATCH 2/8] Fix ubuntu 20 --- contextualization/conf-ansible.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/contextualization/conf-ansible.yml b/contextualization/conf-ansible.yml index 07bb6d6dc..671dea117 100644 --- a/contextualization/conf-ansible.yml +++ b/contextualization/conf-ansible.yml @@ -68,17 +68,18 @@ ################### Install Ansible/pip requisites ######################### - - name: Make sure universe repository is enabled in Ubuntu 20+ - apt_repository: - repo: deb http://archive.ubuntu.com/ubuntu {{ansible_distribution_release}} universe - state: present - update_cache: True - when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 20 - - name: Debian/Ubuntu install requisites with apt - apt: name=python-pip,python-setuptools,sshpass,openssh-client,unzip install_recommends=no + apt: name=curl,python-setuptools,sshpass,openssh-client,unzip install_recommends=no when: ansible_os_family == "Debian" + - name: Debian/Ubuntu install python-pip with apt + apt: name=python-pip install_recommends=no + when: ansible_os_family == "Debian" and not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 20) + + - name: Install pip in in Ubuntu 20+ + command: curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | sudo python + when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 20 + - name: Ubuntu 14 extra packages needed apt: name=gcc,python-dev,libffi-dev,libssl-dev install_recommends=no when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int <= 14 From 85853061ee82107a13daa2caf5e9bbefe6d08cec Mon Sep 17 00:00:00 2001 From: micafer Date: Fri, 3 Jul 2020 12:05:30 +0200 Subject: [PATCH 3/8] Fix ubuntu 20 --- contextualization/conf-ansible.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contextualization/conf-ansible.yml b/contextualization/conf-ansible.yml index 671dea117..a5c1fe9db 100644 --- a/contextualization/conf-ansible.yml +++ b/contextualization/conf-ansible.yml @@ -77,7 +77,7 @@ when: ansible_os_family == "Debian" and not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 20) - name: Install pip in in Ubuntu 20+ - command: curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | sudo python + shell: curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python creates=/usr/local/bin/pip when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 20 - name: Ubuntu 14 extra packages needed From 7d731621e13d9abb06518073e6a1dbf32fc5ca12 Mon Sep 17 00:00:00 2001 From: micafer Date: Fri, 3 Jul 2020 12:19:46 +0200 Subject: [PATCH 4/8] Fix ubuntu 20 --- contextualization/conf-ansible.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/contextualization/conf-ansible.yml b/contextualization/conf-ansible.yml index a5c1fe9db..9b3593229 100644 --- a/contextualization/conf-ansible.yml +++ b/contextualization/conf-ansible.yml @@ -69,16 +69,19 @@ ################### Install Ansible/pip requisites ######################### - name: Debian/Ubuntu install requisites with apt - apt: name=curl,python-setuptools,sshpass,openssh-client,unzip install_recommends=no + apt: name=curl,sshpass,openssh-client,unzip install_recommends=no when: ansible_os_family == "Debian" - name: Debian/Ubuntu install python-pip with apt - apt: name=python-pip install_recommends=no + apt: name=python-pip,python-setuptools install_recommends=no when: ansible_os_family == "Debian" and not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 20) - name: Install pip in in Ubuntu 20+ - shell: curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python creates=/usr/local/bin/pip + shell: + cmd: curl --insecure --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python2 + creates: /usr/local/bin/pip when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 20 + warn: false - name: Ubuntu 14 extra packages needed apt: name=gcc,python-dev,libffi-dev,libssl-dev install_recommends=no From 4b45c8c174abddbe2f1f29a06fe81b83ffb53125 Mon Sep 17 00:00:00 2001 From: micafer Date: Fri, 3 Jul 2020 12:24:04 +0200 Subject: [PATCH 5/8] Fix ubuntu 20 --- contextualization/conf-ansible.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contextualization/conf-ansible.yml b/contextualization/conf-ansible.yml index 9b3593229..ea711b703 100644 --- a/contextualization/conf-ansible.yml +++ b/contextualization/conf-ansible.yml @@ -80,8 +80,8 @@ shell: cmd: curl --insecure --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python2 creates: /usr/local/bin/pip + warn: no when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 20 - warn: false - name: Ubuntu 14 extra packages needed apt: name=gcc,python-dev,libffi-dev,libssl-dev install_recommends=no From 0ded64abdf62d2556a61ca45c3c518d6c8f2365d Mon Sep 17 00:00:00 2001 From: micafer Date: Fri, 3 Jul 2020 12:38:03 +0200 Subject: [PATCH 6/8] Fix ubuntu 20 --- contextualization/conf-ansible.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/contextualization/conf-ansible.yml b/contextualization/conf-ansible.yml index ea711b703..1492f6459 100644 --- a/contextualization/conf-ansible.yml +++ b/contextualization/conf-ansible.yml @@ -77,10 +77,7 @@ when: ansible_os_family == "Debian" and not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 20) - name: Install pip in in Ubuntu 20+ - shell: - cmd: curl --insecure --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python2 - creates: /usr/local/bin/pip - warn: no + shell: curl --insecure --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python2 creates=/usr/local/bin/pip warn=no when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 20 - name: Ubuntu 14 extra packages needed From 4f4b79283a44ba5580d52992a18f7521a5bb6337 Mon Sep 17 00:00:00 2001 From: micafer Date: Fri, 3 Jul 2020 12:45:17 +0200 Subject: [PATCH 7/8] Fix ubuntu 20 --- contextualization/conf-ansible.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contextualization/conf-ansible.yml b/contextualization/conf-ansible.yml index 1492f6459..7525df8ad 100644 --- a/contextualization/conf-ansible.yml +++ b/contextualization/conf-ansible.yml @@ -77,7 +77,7 @@ when: ansible_os_family == "Debian" and not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 20) - name: Install pip in in Ubuntu 20+ - shell: curl --insecure --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python2 creates=/usr/local/bin/pip warn=no + shell: curl --insecure --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python creates=/usr/local/bin/pip warn=no when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 20 - name: Ubuntu 14 extra packages needed From a87ce93ada27d5c6b7f7facde0de71346fad5f34 Mon Sep 17 00:00:00 2001 From: micafer Date: Fri, 3 Jul 2020 12:55:47 +0200 Subject: [PATCH 8/8] Fix ubuntu 20 --- contextualization/conf-ansible.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contextualization/conf-ansible.yml b/contextualization/conf-ansible.yml index 7525df8ad..f09c52d00 100644 --- a/contextualization/conf-ansible.yml +++ b/contextualization/conf-ansible.yml @@ -77,7 +77,7 @@ when: ansible_os_family == "Debian" and not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 20) - name: Install pip in in Ubuntu 20+ - shell: curl --insecure --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python creates=/usr/local/bin/pip warn=no + apt: name=python3-pip,python3-setuptools install_recommends=no when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 20 - name: Ubuntu 14 extra packages needed