From 726acbda673f79e9b63d33c80598f1d38732b83c Mon Sep 17 00:00:00 2001 From: pmikus Date: Wed, 11 Jan 2023 14:00:07 +0000 Subject: fix(core): Remove some Focal leftovers Signed-off-by: pmikus Change-Id: I1c7df34cfb78cf767081acea435dc205b3f44a15 --- fdio.infra.ansible/roles/ab/defaults/main.yaml | 2 -- fdio.infra.ansible/roles/calibration/defaults/main.yaml | 9 --------- fdio.infra.ansible/roles/consul/meta/main.yaml | 1 - fdio.infra.ansible/roles/docker/meta/main.yaml | 1 - fdio.infra.ansible/roles/dpdk/defaults/main.yaml | 3 --- fdio.infra.ansible/roles/iperf/defaults/main.yaml | 3 --- fdio.infra.ansible/roles/nomad/meta/main.yaml | 1 - fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml | 2 -- fdio.infra.ansible/roles/prometheus_exporter/meta/main.yaml | 1 - fdio.infra.ansible/roles/vault/meta/main.yaml | 1 - 10 files changed, 24 deletions(-) (limited to 'fdio.infra.ansible') diff --git a/fdio.infra.ansible/roles/ab/defaults/main.yaml b/fdio.infra.ansible/roles/ab/defaults/main.yaml index 6e9dfbcfce..adabf1464c 100644 --- a/fdio.infra.ansible/roles/ab/defaults/main.yaml +++ b/fdio.infra.ansible/roles/ab/defaults/main.yaml @@ -8,8 +8,6 @@ packages_base: packages_by_distro: ubuntu: - focal: - - "apache2-utils" jammy: - "apache2-utils" diff --git a/fdio.infra.ansible/roles/calibration/defaults/main.yaml b/fdio.infra.ansible/roles/calibration/defaults/main.yaml index da34e97b9d..5dc3330e08 100644 --- a/fdio.infra.ansible/roles/calibration/defaults/main.yaml +++ b/fdio.infra.ansible/roles/calibration/defaults/main.yaml @@ -9,9 +9,6 @@ packages_base: packages_by_distro: ubuntu: - focal: - - "build-essential" - - "dmidecode" jammy: - "build-essential" - "dmidecode" @@ -27,12 +24,6 @@ kernel_version: "{{ kernel_version_by_distro_by_arch[ansible_distribution | lowe kernel_version_by_distro_by_arch: ubuntu: - focal: - x86_64: - - "5.4.0-65-generic" - - "5.4.0-1035-aws" - aarch64: - - "5.4.0-65-generic" jammy: x86_64: - "5.15.0-46-generic" # Placeholder diff --git a/fdio.infra.ansible/roles/consul/meta/main.yaml b/fdio.infra.ansible/roles/consul/meta/main.yaml index bc6d6a1c57..e41a0258fc 100644 --- a/fdio.infra.ansible/roles/consul/meta/main.yaml +++ b/fdio.infra.ansible/roles/consul/meta/main.yaml @@ -12,7 +12,6 @@ galaxy_info: platforms: - name: Ubuntu versions: - - focal - jammy galaxy_tags: - consul diff --git a/fdio.infra.ansible/roles/docker/meta/main.yaml b/fdio.infra.ansible/roles/docker/meta/main.yaml index ac6c0a9980..7bef656eb5 100644 --- a/fdio.infra.ansible/roles/docker/meta/main.yaml +++ b/fdio.infra.ansible/roles/docker/meta/main.yaml @@ -13,7 +13,6 @@ galaxy_info: platforms: - name: Ubuntu versions: - - focal - jammy galaxy_tags: - docker diff --git a/fdio.infra.ansible/roles/dpdk/defaults/main.yaml b/fdio.infra.ansible/roles/dpdk/defaults/main.yaml index 8f1142dfb1..01a3240a6a 100644 --- a/fdio.infra.ansible/roles/dpdk/defaults/main.yaml +++ b/fdio.infra.ansible/roles/dpdk/defaults/main.yaml @@ -8,9 +8,6 @@ packages_base: packages_by_distro: ubuntu: - focal: - - "build-essential" - - "libnuma-dev" jammy: - "build-essential" - "libnuma-dev" diff --git a/fdio.infra.ansible/roles/iperf/defaults/main.yaml b/fdio.infra.ansible/roles/iperf/defaults/main.yaml index f014d83eed..72a3604d1d 100644 --- a/fdio.infra.ansible/roles/iperf/defaults/main.yaml +++ b/fdio.infra.ansible/roles/iperf/defaults/main.yaml @@ -8,9 +8,6 @@ packages_base: packages_by_distro: ubuntu: - focal: - - "build-essential" - - "lib32z1" jammy: - "build-essential" - "lib32z1" diff --git a/fdio.infra.ansible/roles/nomad/meta/main.yaml b/fdio.infra.ansible/roles/nomad/meta/main.yaml index f7b25fe8eb..03396ae6e6 100644 --- a/fdio.infra.ansible/roles/nomad/meta/main.yaml +++ b/fdio.infra.ansible/roles/nomad/meta/main.yaml @@ -13,7 +13,6 @@ galaxy_info: platforms: - name: Ubuntu versions: - - focal - jammy galaxy_tags: - nomad diff --git a/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml b/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml index d07a75d446..5a732e5539 100644 --- a/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml +++ b/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml @@ -8,8 +8,6 @@ packages_base: packages_by_distro: ubuntu: - focal: - - [] jammy: - [] diff --git a/fdio.infra.ansible/roles/prometheus_exporter/meta/main.yaml b/fdio.infra.ansible/roles/prometheus_exporter/meta/main.yaml index 0ee6c2c224..7d8b861882 100644 --- a/fdio.infra.ansible/roles/prometheus_exporter/meta/main.yaml +++ b/fdio.infra.ansible/roles/prometheus_exporter/meta/main.yaml @@ -13,7 +13,6 @@ galaxy_info: platforms: - name: Ubuntu versions: - - focal - jammy galaxy_tags: - prometheus diff --git a/fdio.infra.ansible/roles/vault/meta/main.yaml b/fdio.infra.ansible/roles/vault/meta/main.yaml index 882dcc3a7b..22a62dd438 100644 --- a/fdio.infra.ansible/roles/vault/meta/main.yaml +++ b/fdio.infra.ansible/roles/vault/meta/main.yaml @@ -13,7 +13,6 @@ galaxy_info: platforms: - name: Ubuntu versions: - - focal - jammy galaxy_tags: - vault -- cgit 1.2.3-korg