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 <[email protected]>
  • Loading branch information
richm committed Jul 2, 2024
1 parent a7b5290 commit a2bc3ad
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 11 deletions.
27 changes: 16 additions & 11 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,6 @@
galaxy_info:
author: Miroslav Lichvar <[email protected]>
description: Configure NTP and/or PTP
galaxy_tags:
- system
- time
- redhat
- rhel
- fedora
- centos
- ntp
- ntpd
- chrony
- ptp
company: Red Hat, Inc.
license: MIT
min_ansible_version: "2.9"
Expand All @@ -26,3 +15,19 @@ galaxy_info:
- "7"
- "8"
- "9"
galaxy_tags:
- centos
- chrony
- el6
- el7
- el8
- el9
- el10
- fedora
- ntp
- ntpd
- ptp
- redhat
- rhel
- system
- time
10 changes: 10 additions & 0 deletions vars/AlmaLinux_10.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
timesync_ntp_provider_os_default: chrony
timesync_chrony_dhcp_sourcedir: /run/chrony-dhcp
timesync_chrony_sysconfig_path: /etc/sysconfig/chronyd
timesync_chrony_conf_path: "/etc/chrony.conf"
timesync_ntp_sysconfig_path: /etc/sysconfig/ntpd
timesync_ptp4l_sysconfig_path: /etc/sysconfig/ptp4l
timesync_phc2sys_sysconfig_path: /etc/sysconfig/phc2sys
# wokeignore:rule=master
timesync_timemaster_config_path: /etc/timemaster.conf
10 changes: 10 additions & 0 deletions vars/CentOS_10.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
timesync_ntp_provider_os_default: chrony
timesync_chrony_dhcp_sourcedir: /run/chrony-dhcp
timesync_chrony_sysconfig_path: /etc/sysconfig/chronyd
timesync_chrony_conf_path: "/etc/chrony.conf"
timesync_ntp_sysconfig_path: /etc/sysconfig/ntpd
timesync_ptp4l_sysconfig_path: /etc/sysconfig/ptp4l
timesync_phc2sys_sysconfig_path: /etc/sysconfig/phc2sys
# wokeignore:rule=master
timesync_timemaster_config_path: /etc/timemaster.conf
6 changes: 6 additions & 0 deletions vars/OracleLinux_10.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
timesync_ntp_provider_os_default: chrony
timesync_chrony_dhcp_sourcedir: /run/chrony-dhcp
timesync_chrony_sysconfig_path: /etc/sysconfig/chronyd
timesync_chrony_conf_path: "/etc/chrony.conf"
timesync_ntp_sysconfig_path: /etc/sysconfig/ntpd
10 changes: 10 additions & 0 deletions vars/RedHat_10.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
timesync_ntp_provider_os_default: chrony
timesync_chrony_dhcp_sourcedir: /run/chrony-dhcp
timesync_chrony_sysconfig_path: /etc/sysconfig/chronyd
timesync_chrony_conf_path: "/etc/chrony.conf"
timesync_ntp_sysconfig_path: /etc/sysconfig/ntpd
timesync_ptp4l_sysconfig_path: /etc/sysconfig/ptp4l
timesync_phc2sys_sysconfig_path: /etc/sysconfig/phc2sys
# wokeignore:rule=master
timesync_timemaster_config_path: /etc/timemaster.conf

0 comments on commit a2bc3ad

Please sign in to comment.