Stop installing python2.7 on debian/focal

We still require py2 and the lxc library on the host for bionic as
the bionic CI image still has python2 at /usr/bin/python and ansible
interpreter discovery picks that when targetting localhost.

Change-Id: Ie94afc5a3c794b1c2be266b6642bc9c74b533287

templates/prep-scripts/debian_prep.sh.j2

@@ -21,14 +21,12 @@ apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--fo
 apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes
 apt-get remove -y --purge mariadb* || true
 
-rm -f /usr/bin/python
 rm -f /etc/apt/apt.conf.d/20listchanges
 rm /etc/machine-id || true
 rm /var/lib/dbus/machine-id || true
 touch /etc/machine-id
 rm /etc/sysctl.d/* || true
 echo '' > /etc/sysctl.conf
-ln -s /usr/bin/python2.7 /usr/bin/python
 mkdir -p /root/.ssh
 chmod 700 /root/.ssh
 userdel --force --remove ubuntu || true

templates/prep-scripts/ubuntu_18_prep.sh.j2

@@ -20,13 +20,11 @@ apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--fo
 apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes
 apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes {{ lxc_cache_distro_packages | join(' ') }}
 apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes
-rm -f /usr/bin/python
 rm /etc/machine-id || true
 rm /var/lib/dbus/machine-id || true
 touch /etc/machine-id
 rm /etc/sysctl.d/* || true
 echo '' > /etc/sysctl.conf
-ln -s /usr/bin/python2.7 /usr/bin/python
 mkdir -p /root/.ssh
 chmod 700 /root/.ssh
 userdel --force --remove ubuntu || true

templates/prep-scripts/ubuntu_20_prep.sh.j2

@@ -20,13 +20,11 @@ apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--fo
 apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes
 apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes {{ lxc_cache_distro_packages | join(' ') }}
 apt-get upgrade -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" --force-yes
-rm -f /usr/bin/python
 rm /etc/machine-id || true
 rm /var/lib/dbus/machine-id || true
 touch /etc/machine-id
 rm /etc/sysctl.d/* || true
 echo '' > /etc/sysctl.conf
-ln -s /usr/bin/python2.7 /usr/bin/python
 mkdir -p /root/.ssh
 chmod 700 /root/.ssh
 userdel --force --remove ubuntu || true

vars/debian-host.yml

@@ -35,8 +35,7 @@ _lxc_hosts_distro_packages:
   - lxc
   - lxc-dev
   - procps
-  - python-dev
-  - python-lxc
+  - python3-dev
   - python3-lxc
   - systemd-container
   - xz-utils

vars/debian.yml

@@ -46,8 +46,7 @@ _lxc_cache_distro_packages:
   - openssh-server
   - openssl
   - procps
-  - python2.7
-  - python-dev
+  - python3-lxc
   - python3-dev
   - rsync
   - sudo

vars/ubuntu-18.04-host.yml

@@ -38,9 +38,10 @@ _lxc_hosts_distro_packages:
   - lxc-dev
   - lxc-templates
   - procps
-  - python-dev
-  - python-lxc
+  - python-dev         # py2 is needed here becasue the CI image has py2 at /usr/bin/python
+  - python-lxc         #
   - python3-lxc
+  - python3-dev
   - systemd-container
   - xz-utils
 

vars/ubuntu-18.04.yml

@@ -45,8 +45,6 @@ _lxc_cache_distro_packages:
   - netbase
   - openssh-server
   - openssl
-  - python2.7
-  - python-dev
   - python3-dev
   - rsync
   - sudo

vars/ubuntu-20.04-host.yml

@@ -39,6 +39,7 @@ _lxc_hosts_distro_packages:
   - lxc-templates
   - procps
   - python3-lxc
+  - python3-dev
   - systemd-container
   - xz-utils
 

vars/ubuntu-20.04.yml

@@ -45,7 +45,6 @@ _lxc_cache_distro_packages:
   - netbase
   - openssh-server
   - openssl
-  - python2.7
   - python3-dev
   - rsync
   - sudo