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.

Fix tests_update.yml - centos 10 has no NO-SHA1 subpolicy

Signed-off-by: Rich Megginson <[email protected]>
  • Loading branch information
richm committed Jul 2, 2024
1 parent 98995f9 commit 1a0eb3f
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 20 deletions.
30 changes: 14 additions & 16 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ galaxy_info:
author: Jakub Jelen <[email protected]>
description: This Ansible role manages system-wide crypto policies.
company: Red Hat, Inc.

license: MIT

min_ansible_version: "2.9"

platforms:
- name: Fedora
versions:
Expand All @@ -17,24 +14,25 @@ galaxy_info:
versions:
- "8"
- "9"

galaxy_tags:
- bind
- crypto
- tls
- ssh
- security
- el8
- el9
- el10
- fedora
- redhat
- openssl
- nss
- gnutls
- openssh
- bind
- krb5
- kerberos
- java
- kerberos
- krb5
- libssh
- system
- networking

- nss
- openssh
- openssl
- redhat
- security
- ssh
- system
- tls
dependencies: []
16 changes: 12 additions & 4 deletions tests/tests_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,24 @@
- crypto_policies_active == 'LEGACY'
- crypto_policies_reboot_required | bool

- name: Set policy and subpolicy to use for test
set_fact:
__policy_and_sub: "{{ 'DEFAULT:NO-SHA1'
if 'NO-SHA1' in crypto_policies_available_subpolicies
else 'DEFAULT:AD-SUPPORT'
if 'AD-SUPPORT' in crypto_policies_available_subpolicies
else 'DEFAULT:' ~ crypto_policies_available_subpolicies[0] }}"

- name: Set correct base policy and subpolicy
include_role:
name: linux-system-roles.crypto_policies
vars:
crypto_policies_policy: DEFAULT:NO-SHA1
crypto_policies_policy: "{{ __policy_and_sub }}"
crypto_policies_reload: false
- name: Verify that base policy and subpolicy were updated
assert:
that:
- crypto_policies_active == 'DEFAULT:NO-SHA1'
- crypto_policies_active == __policy_and_sub
- crypto_policies_reboot_required | bool

- name: Setting incorrect base policy should fail
Expand All @@ -44,7 +52,7 @@
- name: Check that we failed in the role
assert:
that:
- crypto_policies_active == 'DEFAULT:NO-SHA1'
- crypto_policies_active == __policy_and_sub
- ansible_failed_result.msg != 'UNREACH'
msg: "Role has not failed when it should have"

Expand All @@ -63,7 +71,7 @@
- name: Check that we failed in the role
assert:
that:
- crypto_policies_active == 'DEFAULT:NO-SHA1'
- crypto_policies_active == __policy_and_sub
- ansible_failed_result.msg != 'UNREACH'
msg: "Role has not failed when it should have"

Expand Down

0 comments on commit 1a0eb3f

Please sign in to comment.