From d0b3048c3662a80fdd1a760102be6e09457b3245 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 5 May 2020 01:59:18 +0200 Subject: finally there is an auto_legacy_silent option for interpreter discovery --- ansible.cfg | 9 +-------- .../debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 | 2 +- .../preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2 | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/ansible.cfg b/ansible.cfg index 372cd74a..40aec251 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -22,14 +22,7 @@ var_compression_level = 9 bin_ansible_callbacks = True -### For we now force usage of python 2 on all operating systems. -### Ansible 2.8 introduced a automatic discovery that raises a lot of -### questions. This new discovery will become the new default in 2.12. -### Until all problems with the discovery have been sorted out we can -### start using it. For now it is way easier and safer to just force -### /usr/bin/python which is always python2 on Debian and Ubuntu. -interpreter_python = /usr/bin/python -#interpreter_python = auto_silent +interpreter_python = auto_legacy_silent ## https://github.com/ansible/ansible/issues/56930 force_valid_group_names = ignore diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 index 71e5acb9..5e15d240 100644 --- a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 @@ -127,7 +127,7 @@ d-i base-installer/install-recommends boolean false d-i apt-setup/security_host string {{ apt_repo_providers[(hostvars[install_hostname].apt_repo_provider | default('default'))].ubuntu }} tasksel tasksel/first multiselect -d-i pkgsel/include string openssh-server python python-apt ifupdown +d-i pkgsel/include string openssh-server python3 python3-apt ifupdown d-i pkgsel/upgrade select safe-upgrade popularity-contest popularity-contest/participate boolean false d-i pkgsel/update-policy select none diff --git a/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2 index 3750e052..06587c46 100644 --- a/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2 @@ -130,7 +130,7 @@ d-i base-installer/install-recommends boolean false d-i apt-setup/security_host string {{ apt_repo_providers[(hostvars[install_hostname].apt_repo_provider | default('default'))].ubuntu }} tasksel tasksel/first multiselect xubuntu-desktop -d-i pkgsel/include string openssh-server python python-apt ifupdown +d-i pkgsel/include string openssh-server python3 python3-apt ifupdown d-i pkgsel/upgrade select safe-upgrade popularity-contest popularity-contest/participate boolean false d-i pkgsel/update-policy select none -- cgit v1.2.3