From 9feafea756fcdbd067fbc767ba16a8e3ecb6d6b2 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Tue, 17 May 2022 08:16:15 +0200 Subject: infra(ansible): Jammy placeholder Signed-off-by: Peter Mikus Change-Id: I693841cadf33d23e417374b949771ba7c3dbccd2 --- fdio.infra.ansible/roles/ab/defaults/main.yaml | 6 +-- .../roles/aws/tasks/ubuntu_bionic.yaml | 10 ---- .../roles/aws/tasks/ubuntu_jammy.yaml | 10 ++++ .../roles/calibration/defaults/main.yaml | 18 +++---- fdio.infra.ansible/roles/common/defaults/main.yaml | 30 +++++------ .../roles/docker/tasks/ubuntu_bionic.yaml | 30 ----------- .../roles/docker/tasks/ubuntu_jammy.yaml | 30 +++++++++++ fdio.infra.ansible/roles/dpdk/defaults/main.yaml | 4 +- fdio.infra.ansible/roles/dpdk/meta/main.yaml | 2 +- fdio.infra.ansible/roles/iperf/defaults/main.yaml | 4 +- fdio.infra.ansible/roles/kernel/defaults/main.yaml | 12 ++--- .../roles/kernel/tasks/ubuntu_bionic.yaml | 62 ---------------------- .../roles/kernel/tasks/ubuntu_jammy.yaml | 62 ++++++++++++++++++++++ .../roles/kubernetes/tasks/ubuntu_bionic.yaml | 37 ------------- .../roles/kubernetes/tasks/ubuntu_jammy.yaml | 37 +++++++++++++ .../roles/performance_tuning/defaults/main.yaml | 4 +- .../roles/python_env/defaults/main.yaml | 11 +--- fdio.infra.ansible/roles/trex/defaults/main.yaml | 4 +- fdio.infra.ansible/roles/vpp/defaults/main.yaml | 12 ++--- 19 files changed, 189 insertions(+), 196 deletions(-) delete mode 100644 fdio.infra.ansible/roles/aws/tasks/ubuntu_bionic.yaml create mode 100644 fdio.infra.ansible/roles/aws/tasks/ubuntu_jammy.yaml delete mode 100644 fdio.infra.ansible/roles/docker/tasks/ubuntu_bionic.yaml create mode 100644 fdio.infra.ansible/roles/docker/tasks/ubuntu_jammy.yaml delete mode 100644 fdio.infra.ansible/roles/kernel/tasks/ubuntu_bionic.yaml create mode 100644 fdio.infra.ansible/roles/kernel/tasks/ubuntu_jammy.yaml delete mode 100644 fdio.infra.ansible/roles/kubernetes/tasks/ubuntu_bionic.yaml create mode 100644 fdio.infra.ansible/roles/kubernetes/tasks/ubuntu_jammy.yaml diff --git a/fdio.infra.ansible/roles/ab/defaults/main.yaml b/fdio.infra.ansible/roles/ab/defaults/main.yaml index 45b80be42d..6e9dfbcfce 100644 --- a/fdio.infra.ansible/roles/ab/defaults/main.yaml +++ b/fdio.infra.ansible/roles/ab/defaults/main.yaml @@ -1,5 +1,5 @@ --- -# file: roles/wrk/defaults/main.yaml +# file: roles/ab/defaults/main.yaml packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower][ansible_distribution_release] + packages_by_arch[ansible_machine] }}" @@ -8,10 +8,10 @@ packages_base: packages_by_distro: ubuntu: - bionic: - - "apache2-utils" focal: - "apache2-utils" + jammy: + - "apache2-utils" packages_by_arch: aarch64: diff --git a/fdio.infra.ansible/roles/aws/tasks/ubuntu_bionic.yaml b/fdio.infra.ansible/roles/aws/tasks/ubuntu_bionic.yaml deleted file mode 100644 index 4108a98720..0000000000 --- a/fdio.infra.ansible/roles/aws/tasks/ubuntu_bionic.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# file: roles/aws/tasks/ubuntu_bionic.yaml.yaml - -- name: Enable deb-src APT Repository - apt_repository: - repo: "deb-src http://archive.ubuntu.com/ubuntu bionic main" - state: "present" - update_cache: true - tags: - - aws-enable-src-repo diff --git a/fdio.infra.ansible/roles/aws/tasks/ubuntu_jammy.yaml b/fdio.infra.ansible/roles/aws/tasks/ubuntu_jammy.yaml new file mode 100644 index 0000000000..4ee1545baf --- /dev/null +++ b/fdio.infra.ansible/roles/aws/tasks/ubuntu_jammy.yaml @@ -0,0 +1,10 @@ +--- +# file: roles/aws/tasks/ubuntu_jammy.yaml.yaml + +- name: Enable deb-src APT Repository + apt_repository: + repo: "deb-src http://archive.ubuntu.com/ubuntu jammy main" + state: "present" + update_cache: true + tags: + - aws-enable-src-repo diff --git a/fdio.infra.ansible/roles/calibration/defaults/main.yaml b/fdio.infra.ansible/roles/calibration/defaults/main.yaml index 020c0119b1..bb904622e4 100644 --- a/fdio.infra.ansible/roles/calibration/defaults/main.yaml +++ b/fdio.infra.ansible/roles/calibration/defaults/main.yaml @@ -9,10 +9,10 @@ packages_base: packages_by_distro: ubuntu: - bionic: + focal: - "build-essential" - "dmidecode" - focal: + jammy: - "build-essential" - "dmidecode" @@ -27,13 +27,6 @@ kernel_version: "{{ kernel_version_by_distro_by_arch[ansible_distribution | lowe kernel_version_by_distro_by_arch: ubuntu: - bionic: - x86_64: - - "4.15.0-72-generic" - - "5.3.0-1020-azure" - - "4.15.0-1057-aws" - aarch64: - - "4.15.0-54-generic" focal: x86_64: - "5.4.0-65-generic" @@ -41,6 +34,13 @@ kernel_version_by_distro_by_arch: - "5.4.0-1035-aws" aarch64: - "5.4.0-65-generic" + jammy: + x86_64: + - "5.15.0-0-generic" # Placeholder + - "5.3.0-1020-azure" # Placeholder + - "5.15.0-1000-aws" # Placeholder + aarch64: + - "5.15.0-0-generic" # Placeholder pma_directory: "/tmp/pma_tools" jitter_core: 7 diff --git a/fdio.infra.ansible/roles/common/defaults/main.yaml b/fdio.infra.ansible/roles/common/defaults/main.yaml index ba7129711a..5c94f58398 100644 --- a/fdio.infra.ansible/roles/common/defaults/main.yaml +++ b/fdio.infra.ansible/roles/common/defaults/main.yaml @@ -18,37 +18,37 @@ packages_base: packages_by_distro: ubuntu: - bionic: + focal: + - "bpfcc-tools" - "build-essential" + - "libbpfcc" + - "libbpfcc-dev" + - "libclang1-9" + - "libllvm9" - "libpcap-dev" - "net-tools" - - "python-all" - - "python-apt" - - "python-cffi" - - "python-cffi-backend" - - "python-dev" - - "python-pip" - - "python-setuptools" - "python3-all" - "python3-apt" + - "python3-bpfcc" - "python3-cffi" - "python3-cffi-backend" - "python3-dev" - "python3-pip" - "python3-pyelftools" - "python3-setuptools" - focal: - - "bpfcc-tools" + jammy: - "build-essential" - - "libbpfcc" - - "libbpfcc-dev" - - "libclang1-9" - - "libllvm9" - "libpcap-dev" - "net-tools" + - "python-all" + - "python-apt" + - "python-cffi" + - "python-cffi-backend" + - "python-dev" + - "python-pip" + - "python-setuptools" - "python3-all" - "python3-apt" - - "python3-bpfcc" - "python3-cffi" - "python3-cffi-backend" - "python3-dev" diff --git a/fdio.infra.ansible/roles/docker/tasks/ubuntu_bionic.yaml b/fdio.infra.ansible/roles/docker/tasks/ubuntu_bionic.yaml deleted file mode 100644 index 21f28e0c55..0000000000 --- a/fdio.infra.ansible/roles/docker/tasks/ubuntu_bionic.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# file: roles/docker/tasks/ubuntu_bionic.yaml - -- name: Inst - Dependencies - apt: - name: - - "apt-transport-https" - - "ca-certificates" - - "gpg-agent" - - "software-properties-common" - state: "present" - cache_valid_time: 3600 - install_recommends: false - tags: - - docker-inst-dependencies - -- name: Conf - Add APT Key - apt_key: - url: "{{ docker_apt_gpg_key }}" - state: "{{ docker_apt_gpg_key_state }}" - tags: - - docker-conf-apt - -- name: Conf - Install APT Repository - apt_repository: - repo: "{{ docker_apt_repository }}" - state: "{{ docker_apt_repository_state }}" - update_cache: true - tags: - - docker-conf-apt diff --git a/fdio.infra.ansible/roles/docker/tasks/ubuntu_jammy.yaml b/fdio.infra.ansible/roles/docker/tasks/ubuntu_jammy.yaml new file mode 100644 index 0000000000..51f60ee348 --- /dev/null +++ b/fdio.infra.ansible/roles/docker/tasks/ubuntu_jammy.yaml @@ -0,0 +1,30 @@ +--- +# file: roles/docker/tasks/ubuntu_jammy.yaml + +- name: Inst - Dependencies + apt: + name: + - "apt-transport-https" + - "ca-certificates" + - "gpg-agent" + - "software-properties-common" + state: "present" + cache_valid_time: 3600 + install_recommends: false + tags: + - docker-inst-dependencies + +- name: Conf - Add APT Key + apt_key: + url: "{{ docker_apt_gpg_key }}" + state: "{{ docker_apt_gpg_key_state }}" + tags: + - docker-conf-apt + +- name: Conf - Install APT Repository + apt_repository: + repo: "{{ docker_apt_repository }}" + state: "{{ docker_apt_repository_state }}" + update_cache: true + tags: + - docker-conf-apt diff --git a/fdio.infra.ansible/roles/dpdk/defaults/main.yaml b/fdio.infra.ansible/roles/dpdk/defaults/main.yaml index 79580cbf6d..b9602bc2d2 100644 --- a/fdio.infra.ansible/roles/dpdk/defaults/main.yaml +++ b/fdio.infra.ansible/roles/dpdk/defaults/main.yaml @@ -8,10 +8,10 @@ packages_base: packages_by_distro: ubuntu: - bionic: + focal: - "build-essential" - "libnuma-dev" - focal: + jammy: - "build-essential" - "libnuma-dev" diff --git a/fdio.infra.ansible/roles/dpdk/meta/main.yaml b/fdio.infra.ansible/roles/dpdk/meta/main.yaml index cc3bf5f731..e52ecb87c1 100644 --- a/fdio.infra.ansible/roles/dpdk/meta/main.yaml +++ b/fdio.infra.ansible/roles/dpdk/meta/main.yaml @@ -18,7 +18,7 @@ galaxy_info: platforms: - name: Ubuntu versions: - - bionic - focal + - jammy galaxy_tags: - dpdk diff --git a/fdio.infra.ansible/roles/iperf/defaults/main.yaml b/fdio.infra.ansible/roles/iperf/defaults/main.yaml index 07af60b63a..f014d83eed 100644 --- a/fdio.infra.ansible/roles/iperf/defaults/main.yaml +++ b/fdio.infra.ansible/roles/iperf/defaults/main.yaml @@ -8,10 +8,10 @@ packages_base: packages_by_distro: ubuntu: - bionic: + focal: - "build-essential" - "lib32z1" - focal: + jammy: - "build-essential" - "lib32z1" diff --git a/fdio.infra.ansible/roles/kernel/defaults/main.yaml b/fdio.infra.ansible/roles/kernel/defaults/main.yaml index 92dc30f58b..60fa91e970 100644 --- a/fdio.infra.ansible/roles/kernel/defaults/main.yaml +++ b/fdio.infra.ansible/roles/kernel/defaults/main.yaml @@ -6,22 +6,22 @@ kernel_version: "{{ kernel_version_by_distro[ansible_distribution|lower][ansible kernel_version_by_distro: ubuntu: - bionic: - - "4.15.0-72" focal: - "5.4.0-65" + jammy: + - "4.15.0-72" kernel_packages: "{{ kernel_packages_by_distro[ansible_distribution|lower][ansible_distribution_release] | flatten(levels=1) }}" kernel_packages_by_distro: ubuntu: - bionic: + focal: - "linux-image" - "linux-headers" - "linux-modules" - "linux-modules-extra" - "linux-tools" - focal: + jammy: - "linux-image" - "linux-headers" - "linux-modules" @@ -33,11 +33,11 @@ absent_packages: "{{ absent_packages_by_distro[ansible_distribution|lower][ansib absent_packages_by_distro: ubuntu: - bionic: + focal: - "amd64-microcode" - "intel-microcode" - "iucode-tool" - focal: + jammy: - "amd64-microcode" - "intel-microcode" - "iucode-tool" diff --git a/fdio.infra.ansible/roles/kernel/tasks/ubuntu_bionic.yaml b/fdio.infra.ansible/roles/kernel/tasks/ubuntu_bionic.yaml deleted file mode 100644 index 871cc9eee7..0000000000 --- a/fdio.infra.ansible/roles/kernel/tasks/ubuntu_bionic.yaml +++ /dev/null @@ -1,62 +0,0 @@ ---- -# file: roles/kernel/tasks/ubuntu_bionic.yaml - -- name: Get Available Kernel Versions - command: "apt-cache showpkg linux-headers-*" - changed_when: false - register: apt_kernel_list - tags: - - kernel-inst - -- name: Get installed packages with APT - command: "dpkg -l" - changed_when: false - register: apt_packages_list - tags: - - kernel-inst - -- name: Set target APT kernel version - set_fact: - _kernel: "{{ apt_kernel_list | deb_kernel( - kernel_version, ansible_kernel) }}" - tags: - - kernel-inst - -- name: Disable APT auto upgrade - lineinfile: - path: "/etc/apt/apt.conf.d/20auto-upgrades" - state: "present" - regexp: "APT::Periodic::Unattended-Upgrade \"[0-9]\";" - line: "APT::Periodic::Unattended-Upgrade \"0\";" - create: true - mode: 0644 - tags: - - kernel-inst - -- name: Ensure Packages Versions - apt: - name: "{{ apt_kernel_list | deb_kernel_pkg( - kernel_version, ansible_kernel, ansible_distribution, - ansible_architecture, item) }}" - loop: "{{ kernel_packages }}" - tags: - - kernel-inst - -- name: Ensure Any Other Kernel Packages Are Removed - apt: - name: "{{ apt_packages_list | deb_installed_kernel( - apt_kernel_list, kernel_version, ansible_kernel) }}" - state: absent - purge: true - notify: - - "Reboot Server" - tags: - - kernel-inst - -- name: Ensure Any Microcode Is Absent - apt: - name: "{{ absent_packages }}" - state: absent - purge: true - tags: - - kernel-inst diff --git a/fdio.infra.ansible/roles/kernel/tasks/ubuntu_jammy.yaml b/fdio.infra.ansible/roles/kernel/tasks/ubuntu_jammy.yaml new file mode 100644 index 0000000000..15ce221e66 --- /dev/null +++ b/fdio.infra.ansible/roles/kernel/tasks/ubuntu_jammy.yaml @@ -0,0 +1,62 @@ +--- +# file: roles/kernel/tasks/ubuntu_jammy.yaml + +- name: Get Available Kernel Versions + command: "apt-cache showpkg linux-headers-*" + changed_when: false + register: apt_kernel_list + tags: + - kernel-inst + +- name: Get installed packages with APT + command: "dpkg -l" + changed_when: false + register: apt_packages_list + tags: + - kernel-inst + +- name: Set target APT kernel version + set_fact: + _kernel: "{{ apt_kernel_list | deb_kernel( + kernel_version, ansible_kernel) }}" + tags: + - kernel-inst + +- name: Disable APT auto upgrade + lineinfile: + path: "/etc/apt/apt.conf.d/20auto-upgrades" + state: "present" + regexp: "APT::Periodic::Unattended-Upgrade \"[0-9]\";" + line: "APT::Periodic::Unattended-Upgrade \"0\";" + create: true + mode: 0644 + tags: + - kernel-inst + +- name: Ensure Packages Versions + apt: + name: "{{ apt_kernel_list | deb_kernel_pkg( + kernel_version, ansible_kernel, ansible_distribution, + ansible_architecture, item) }}" + loop: "{{ kernel_packages }}" + tags: + - kernel-inst + +- name: Ensure Any Other Kernel Packages Are Removed + apt: + name: "{{ apt_packages_list | deb_installed_kernel( + apt_kernel_list, kernel_version, ansible_kernel) }}" + state: absent + purge: true + notify: + - "Reboot Server" + tags: + - kernel-inst + +- name: Ensure Any Microcode Is Absent + apt: + name: "{{ absent_packages }}" + state: absent + purge: true + tags: + - kernel-inst diff --git a/fdio.infra.ansible/roles/kubernetes/tasks/ubuntu_bionic.yaml b/fdio.infra.ansible/roles/kubernetes/tasks/ubuntu_bionic.yaml deleted file mode 100644 index e2f2b86058..0000000000 --- a/fdio.infra.ansible/roles/kubernetes/tasks/ubuntu_bionic.yaml +++ /dev/null @@ -1,37 +0,0 @@ ---- -# file: roles/kubernetes/tasks/ubuntu_bionic.yaml - -- name: Kubernetes repository - Dependencies - apt: - name: - - 'apt-transport-https' - - 'ca-certificates' - - 'software-properties-common' - state: 'present' - cache_valid_time: 3600 - install_recommends: false - tags: install-kubernetes - -- name: Kubernetes repository - Add an Apt signing key - apt_key: - url: 'https://packages.cloud.google.com/apt/doc/apt-key.gpg' - state: 'present' - tags: install-kubernetes - -- name: Kubernetes repository - Install APT repository - apt_repository: - repo: '{{ kubernetes_apt_repository }}' - state: '{{ kubernetes_apt_repository_state }}' - update_cache: true - tags: install-kubernetes - -- name: Kubernetes - Install - apt: - name: - - 'kubernetes-cni=0.6.0-00' - - 'kubeadm={{ kubernetes_version }}' - - 'kubectl={{ kubernetes_version }}' - - 'kubelet={{ kubernetes_version }}' - state: '{{ kubernetes_apt_package_state }}' - force: true - tags: install-kubernetes diff --git a/fdio.infra.ansible/roles/kubernetes/tasks/ubuntu_jammy.yaml b/fdio.infra.ansible/roles/kubernetes/tasks/ubuntu_jammy.yaml new file mode 100644 index 0000000000..5e155257ce --- /dev/null +++ b/fdio.infra.ansible/roles/kubernetes/tasks/ubuntu_jammy.yaml @@ -0,0 +1,37 @@ +--- +# file: roles/kubernetes/tasks/ubuntu_jammy.yaml + +- name: Kubernetes repository - Dependencies + apt: + name: + - 'apt-transport-https' + - 'ca-certificates' + - 'software-properties-common' + state: 'present' + cache_valid_time: 3600 + install_recommends: false + tags: install-kubernetes + +- name: Kubernetes repository - Add an Apt signing key + apt_key: + url: 'https://packages.cloud.google.com/apt/doc/apt-key.gpg' + state: 'present' + tags: install-kubernetes + +- name: Kubernetes repository - Install APT repository + apt_repository: + repo: '{{ kubernetes_apt_repository }}' + state: '{{ kubernetes_apt_repository_state }}' + update_cache: true + tags: install-kubernetes + +- name: Kubernetes - Install + apt: + name: + - 'kubernetes-cni=0.6.0-00' + - 'kubeadm={{ kubernetes_version }}' + - 'kubectl={{ kubernetes_version }}' + - 'kubelet={{ kubernetes_version }}' + state: '{{ kubernetes_apt_package_state }}' + force: true + tags: install-kubernetes diff --git a/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml b/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml index 128be4970b..d07a75d446 100644 --- a/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml +++ b/fdio.infra.ansible/roles/performance_tuning/defaults/main.yaml @@ -8,10 +8,10 @@ packages_base: packages_by_distro: ubuntu: - bionic: - - [] focal: - [] + jammy: + - [] packages_by_arch: aarch64: diff --git a/fdio.infra.ansible/roles/python_env/defaults/main.yaml b/fdio.infra.ansible/roles/python_env/defaults/main.yaml index 36e599acfe..89e85d64fc 100644 --- a/fdio.infra.ansible/roles/python_env/defaults/main.yaml +++ b/fdio.infra.ansible/roles/python_env/defaults/main.yaml @@ -8,14 +8,7 @@ packages_base: packages_by_distro: ubuntu: - bionic: - - "python-all" - - "python-apt" - - "python-cffi" - - "python-cffi-backend" - - "python-dev" - - "python-pip" - - "python-setuptools" + focal: - "python3-all" - "python3-apt" - "python3-cffi" @@ -24,7 +17,7 @@ packages_by_distro: - "python3-pip" - "python3-pyelftools" - "python3-setuptools" - focal: + jammy: - "python3-all" - "python3-apt" - "python3-cffi" diff --git a/fdio.infra.ansible/roles/trex/defaults/main.yaml b/fdio.infra.ansible/roles/trex/defaults/main.yaml index 181cb9da85..180d635def 100644 --- a/fdio.infra.ansible/roles/trex/defaults/main.yaml +++ b/fdio.infra.ansible/roles/trex/defaults/main.yaml @@ -8,7 +8,7 @@ packages_base: packages_by_distro: ubuntu: - bionic: + focal: - "build-essential" - "libmnl-dev" - "libnuma-dev" @@ -19,7 +19,7 @@ packages_by_distro: - "pciutils" - "python3-pip" - "zlib1g-dev" - focal: + jammy: - "build-essential" - "libmnl-dev" - "libnuma-dev" diff --git a/fdio.infra.ansible/roles/vpp/defaults/main.yaml b/fdio.infra.ansible/roles/vpp/defaults/main.yaml index 7fac499307..55051b8c8f 100644 --- a/fdio.infra.ansible/roles/vpp/defaults/main.yaml +++ b/fdio.infra.ansible/roles/vpp/defaults/main.yaml @@ -12,19 +12,19 @@ packages_base: packages_by_distro: ubuntu: - bionic: + focal: - "build-essential" - "libglib2.0-dev" - - "libmbedcrypto1" - - "libmbedtls10" + - "libmbedcrypto3" + - "libmbedtls12" - "libmbedx509-0" - "libnuma-dev" - "libpixman-1-dev" - focal: + jammy: - "build-essential" - "libglib2.0-dev" - - "libmbedcrypto3" - - "libmbedtls12" + - "libmbedcrypto1" + - "libmbedtls10" - "libmbedx509-0" - "libnuma-dev" - "libpixman-1-dev" -- cgit 1.2.3-korg