From 7b93e96740997dab4383140a639b055e074f63c1 Mon Sep 17 00:00:00 2001 From: pmikus Date: Mon, 15 Feb 2021 16:16:31 +0000 Subject: Infra: Ansible Ubuntu Focal Signed-off-by: pmikus Change-Id: I6558938fe4bbdfb5add7a361adb4a12da6b0a6dc --- .../ansible/roles/kernel/defaults/main.yaml | 39 +++++++++++++++------- 1 file changed, 27 insertions(+), 12 deletions(-) (limited to 'resources/tools/testbed-setup/ansible/roles/kernel/defaults') diff --git a/resources/tools/testbed-setup/ansible/roles/kernel/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/kernel/defaults/main.yaml index d84a163487..b9b4253622 100644 --- a/resources/tools/testbed-setup/ansible/roles/kernel/defaults/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/kernel/defaults/main.yaml @@ -2,27 +2,42 @@ # file: roles/kernel/defaults/main.yaml # Kernel version to install (Default to any version). -kernel_version: "{{ kernel_version_by_distro[ansible_distribution | lower] | join(' ') }}" +kernel_version: "{{ kernel_version_by_distro[ansible_distribution|lower][ansible_distribution_release] | join(' ') }}" kernel_version_by_distro: ubuntu: - - "4.15.0-72" + bionic: + - "4.15.0-72" + focal: + - "5.4.0-65" -kernel_packages: "{{ kernel_packages_by_distro[ansible_distribution | lower] | flatten(levels=1) }}" +kernel_packages: "{{ kernel_packages_by_distro[ansible_distribution|lower][ansible_distribution_release] | flatten(levels=1) }}" kernel_packages_by_distro: ubuntu: - - "linux-image" - - "linux-headers" - - "linux-modules" - - "linux-modules-extra" - - "linux-tools" + bionic: + - "linux-image" + - "linux-headers" + - "linux-modules" + - "linux-modules-extra" + - "linux-tools" + focal: + - "linux-image" + - "linux-headers" + - "linux-modules" + - "linux-modules-extra" + - "linux-tools" # Packages to remove in relation to kernel upgrade. -absent_packages: "{{ absent_packages_by_distro[ansible_distribution | lower] | flatten(levels=1) }}" +absent_packages: "{{ absent_packages_by_distro[ansible_distribution|lower][ansible_distribution_release] | flatten(levels=1) }}" absent_packages_by_distro: ubuntu: - - "amd64-microcode" - - "intel-microcode" - - "iucode-tool" + bionic: + - "amd64-microcode" + - "intel-microcode" + - "iucode-tool" + focal: + - "amd64-microcode" + - "intel-microcode" + - "iucode-tool" \ No newline at end of file -- cgit 1.2.3-korg