Add Ubuntu 20.04 support and use Python 3 (#6157)

This commit is contained in:
Maxime Guyot
2020-06-16 22:04:05 +02:00
committed by GitHub
parent dba645421f
commit c6588856c7
11 changed files with 29 additions and 21 deletions

View File

@@ -12,8 +12,12 @@ driver:
platforms:
- name: ubuntu18
box: generic/ubuntu1804
cpus: 2
memory: 2048
cpus: 1
memory: 512
- name: ubuntu20
box: generic/ubuntu2004
cpus: 1
memory: 512
provisioner:
name: ansible
lint:

View File

@@ -2,7 +2,7 @@
# Some Debian based distros ship without Python installed
- name: Check if bootstrap is needed
raw: which python
raw: which python3
register: need_bootstrap
failed_when: false
changed_when: false
@@ -77,10 +77,10 @@
- '"bionic" in os_release.stdout'
- need_dnssec_allow_downgrade.rc
- name: Install python
- name: Install python3
raw:
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y python-minimal
DEBIAN_FRONTEND=noninteractive apt-get install -y python3-minimal
become: true
environment: {}
when:
@@ -91,4 +91,5 @@
package:
name: dbus
state: present
use: apt
become: true

View File

@@ -0,0 +1,2 @@
---
kube_resolv_conf: "/run/systemd/resolve/resolv.conf"