ansible: replace old ubuntu1404 DO host with fedora38 (#3352)

Refs: #3350
nodejs · May 17, 2023 · 1ba2d52 · 1ba2d52
1 parent c53f448
commit 1ba2d52
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/ansible/inventory.yml b/ansible/inventory.yml
@@ -130,10 +130,10 @@ hosts:
         fedora32-x64-1: {ip: 159.203.117.50}
         fedora34-x64-1: {ip: 178.62.236.249}
         fedora34-x64-2: {ip: 159.203.98.84}
+        fedora38-x64-1: {ip: 162.243.187.89}
         freebsd12-x64-1: {ip: 45.55.90.237, user: freebsd}
         freebsd12-x64-2: {ip: 107.170.28.213, user: freebsd}
         rhel8-x64-1: {ip: 161.35.139.78, build_test_v8: yes}
-        ubuntu1404-x64-1: {ip: 45.55.252.223}
         ubuntu1604-x86-1: {ip: 159.203.77.233}
         ubuntu1604-x86-2: {ip: 104.131.191.135}
         ubuntu1804_docker-x64-1: {ip: 134.209.55.216}

diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml
@@ -72,7 +72,7 @@ packages: {
   ],
 
   fedora: [
-    'bzip2,ccache,gcc-c++,git,fontconfig,sudo,make',
+    'bzip2,ccache,gcc-c++,git,fontconfig,sudo,make,python3-pip',
   ],
 
   freebsd: [

diff --git a/ansible/roles/bootstrap/tasks/partials/fedora.yml b/ansible/roles/bootstrap/tasks/partials/fedora.yml
@@ -7,20 +7,6 @@
 #        use our own logic. Perhaps better to avoid ansible facts altogether?
 #
 
-- name: check for python
-  raw: stat /usr/bin/python2
-  check_mode: no
-  register: has_python
-  failed_when: has_python.rc > 1
-
-- name: install python2 and python3
-  when: has_python.rc == 1
-  raw: dnf install -y python2 python3 python3-dnf
-
-- name: make /usr/bin/python -> python2
-  when: os not in ("fedora30")
-  raw: alternatives --install /usr/bin/python python /usr/bin/python2.7 1 && alternatives --set python /usr/bin/python2.7
-
 - name: check for {{ 'libselinux-python' if os in ("fedora30") else 'python3-libselinux' }} bindings
   raw: dnf info {{ 'libselinux-python' if os in ("fedora30") else 'python3-libselinux' }} | grep Installed
   check_mode: no
@@ -33,7 +19,7 @@
 
 - name: install python3-libselinux bindings
   when: os not in ("fedora30") and has_libselinux.rc == 1
-  raw: dnf install -y libselinux-python
+  raw: dnf install -y python3-libselinux
 
 - name: disable selinux
   selinux: state=disabled