Skip to content

Commit

Permalink
fix: add support for EL10
Browse files Browse the repository at this point in the history
According to the Ansible team, support for listing platforms in
role `meta/main.yml` files is being removed.
Instead, they recommend using `galaxy_tags`

https://github.com/ansible/ansible/blob/stable-2.17/changelogs/CHANGELOG-v2.17.rst
"Remove the galaxy_info field platforms from the role templates"
ansible/ansible#82453

Many roles already have tags such as "rhel", "redhat", "centos", and "fedora".
I propose that we ensure all of the system roles have these tags.
Some of our roles support Suse, Debian, Ubuntu, and others.
We should add tags for those e.g. the ssh role already has tags for "debian" and "ubuntu".

In addition - for each version listed under `platforms.EL` - add a tag like `elN`.

Q: Why not use a delimiter between the platform and the version e.g. `el-10`?

This is not allowed by ansible-lint:

```
meta-no-tags: Tags must contain lowercase letters and digits only., invalid: 'el-10'
meta/main.yml:1
```

So we cannot use uppercase letters either.

Q: Why not use our own meta/main.yml field?

No other fields are allowed by ansible-lint:

```
syntax-check[specific]: 'myfield' is not a valid attribute for a RoleMetadata
```

Q: Why not use some other field?

There are no other applicable or suitable fields.

Q: What happens when we want to support versions like `N.M`?

Use the word "dot" instead of "." e.g. `el10dot3`.
Similarly - use "dash" instead of "-".

We do not need tags such as `fedoraall`.
The `fedora` tag implies that the role works on all supported versions of fedora.
Otherwise, use tags such as `fedora40` if the role only supports specific versions.

In addition - for roles that have different variable files for EL9, create
the corresponding EL10 files.

Signed-off-by: Rich Megginson <rmeggins@redhat.com>
  • Loading branch information
richm committed Jul 2, 2024
1 parent e0a5ee9 commit 685b37a
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 25 deletions.
1 change: 1 addition & 0 deletions .ostree/packages-testing-CentOS-10.txt
3 changes: 0 additions & 3 deletions .ostree/packages-testing-CentOS-7.txt

This file was deleted.

1 change: 1 addition & 0 deletions .ostree/packages-testing-CentOS-7.txt
3 changes: 0 additions & 3 deletions .ostree/packages-testing-CentOS-8.txt

This file was deleted.

1 change: 1 addition & 0 deletions .ostree/packages-testing-CentOS-8.txt
3 changes: 0 additions & 3 deletions .ostree/packages-testing-CentOS-9.txt

This file was deleted.

1 change: 1 addition & 0 deletions .ostree/packages-testing-CentOS-9.txt
3 changes: 3 additions & 0 deletions .ostree/packages-testing-RedHat-10.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
bash
man-db
openssh-keycat
46 changes: 30 additions & 16 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,40 @@ galaxy_info:
- all
- name: Debian
versions:
- wheezy
- jessie
- stretch
- buster
- "wheezy"
- "jessie"
- "stretch"
- "buster"
- name: Ubuntu
versions:
- precise
- trusty
- xenial
- bionic
- focal
- jammy
- "precise"
- "trusty"
- "xenial"
- "bionic"
- "focal"
- "jammy"
galaxy_tags:
- networking
- system
- ssh
- centos
- client
- debianbuster
- debianjessie
- debianstretch
- debianwheezy
- el6
- el7
- el8
- el9
- el10
- fedora
- networking
- openssh
- ubuntu
- debian
- centos
- redhat
- ssh
- system
- ubuntubionic
- ubuntufocal
- ubuntujammy
- ubuntuprecise
- ubuntutrusty
- ubuntuxenial
dependencies: []
1 change: 1 addition & 0 deletions vars/CentOS_10.yml
8 changes: 8 additions & 0 deletions vars/RedHat_10.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
# This system supports drop in directory so defaults are adjusted
__ssh_supports_drop_in: true
__ssh_drop_in_name: "00-ansible"

# This default lists the main configuration file defaults
__ssh_defaults:
Include: /etc/ssh/ssh_config.d/*.conf

0 comments on commit 685b37a

Please sign in to comment.