From 0fdd2ad27d9cc600cbd3bf6a394be6bcb49cd0cf Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 15 Aug 2023 15:51:20 +0200 Subject: [PATCH] Drop Ubuntu 20.04 support Ubuntu 20.04 is not supported or tested in 2023.2, so we remove focal-related variables from the role. Change-Id: I52f772f519db6c4924443498bb3453f69cd997de --- meta/main.yml | 1 - vars/ubuntu-20.04.yml | 97 ------------------------------------------- 2 files changed, 98 deletions(-) delete mode 100644 vars/ubuntu-20.04.yml diff --git a/meta/main.yml b/meta/main.yml index 5bc0a0a4..92dba564 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -27,7 +27,6 @@ galaxy_info: - bullseye - name: Ubuntu versions: - - focal - jammy - name: EL versions: diff --git a/vars/ubuntu-20.04.yml b/vars/ubuntu-20.04.yml deleted file mode 100644 index 3730ea7d..00000000 --- a/vars/ubuntu-20.04.yml +++ /dev/null @@ -1,97 +0,0 @@ ---- -# Copyright 2016, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -## Defined required kernel -openstack_host_required_kernel: 5.4.0-0-generic -openstack_host_sysstat_file: /etc/default/sysstat -openstack_host_sysstat_cron_file: /etc/cron.d/sysstat -openstack_host_cron_template: sysstat.cron.debian.j2 -openstack_host_module_file: /etc/modules - -## Kernel modules loaded on hosts -openstack_host_kernel_modules: - - name: 8021q - - name: br_netfilter - - name: dm_multipath - - name: dm_snapshot - - name: ebtables - - name: ip6table_filter - - name: ip6_tables - - name: ip_tables - - name: xt_MASQUERADE - - name: ipt_REJECT - - name: iptable_filter - - name: iptable_mangle - - name: iptable_nat - - name: ip_vs - - name: iscsi_tcp - - name: nbd - - name: nf_conntrack - - name: nf_defrag_ipv4 - - name: nf_nat - - name: vhost_net - - name: x_tables - -## Base packages -_openstack_host_distro_packages: - - acl - - apt-utils - -## Bare metal base packages -_openstack_host_metal_distro_packages: - - apparmor-utils - - apt-transport-https - - bridge-utils - - cgroup-lite - - curl - - dmeventd - - dstat - - ebtables - - htop - - iptables - - irqbalance - - libkmod2 - - lvm2 - - rsync - - rsyslog - - software-properties-common - - sysstat - - time - - vlan - - wget - -_package_repos_keys: [] -## example: -# - id: -# file: -# keyserver: -# url: -# state: - -_package_list: - - name: ubuntu-cloud-keyring - state: "{{ openstack_hosts_package_state }}" - - name: ca-certificates - state: latest - -_package_repos: - - repo: "deb {{ apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }} {{ ansible_facts['lsb']['codename'] }}-updates/yoga main" - state: present - filename: "uca" - -_openstack_ca_bundle_path: /etc/ssl/certs/ca-certificates.crt - -_openstack_hosts_package_manager_default_conf: | - APT::Install-Recommends "false";