Commit Graph
22 Commits
Author SHA1 Message Date
83471be571 fix: Update sr_fingerprint task calls to use new structured parameters
The sr_fingerprint module was rewritten to accept structured parameters
(status, role_name, role_path, etc.) instead of a free-form sr_message.
Update the role tasks and tests to match the new module interface.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-08-06 16:11:09 -06:00
Sergei PetrosianandRichard Megginson d9ba105ef3 feat: Write roles fingerprints to /var/log/sysroles.jsonl [citest_skip]
Feature: Write roles fingerprints to /var/log/sysroles.jsonl [citest_skip]

Reason: By default logs are printed to rsyslog. This change adds a possibility to write logs to a file on the system for the downstream users.

Result: For the upstream, this makes rsyslog log message more detailed. For the downstream - also writes logs to /var/log/sysroles.jsonl
Signed-off-by: Sergei Petrosian <spetrosi@redhat.com>
2026-08-06 16:11:09 -06:00
Rich MegginsonandRichard Megginson 5a4a533fee test: add role fingerprints to syslog
Test updates based on testing with bootc and on other platforms.

Signed-off-by: Rich Megginson <rmeggins@redhat.com>
2026-04-22 14:45:35 -06:00
Rich MegginsonandRichard Megginson 659d89dd69 feat: add role fingerprints to syslog
Feature: Add a fingerprint string to the system log to indicate when the role began
successfully, and when the role finished successfully.  The fingerprint string indicates
the role name, a timestamp, and the platform.

Reason: Users can see when the role was used and if it was used successfully.  This
information from the system log can be collected by log scanners and aggregators
for further analysis.

Result: The role logs fingerprints to the system log.

This also adds a test to check if the fingerprints were written upon a successful
role invocation.

Signed-off-by: Rich Megginson <rmeggins@redhat.com>
2026-04-22 10:52:25 -06:00
Rich MegginsonandRichard Megginson 0732181e3f ci: update header for run_role_with_clear_facts [citest_skip]
Update header for run_role_with_clear_facts to indicate not editable
and clarify what it does

Signed-off-by: Rich Megginson <rmeggins@redhat.com>
2026-04-08 07:42:56 -06:00
Rich MegginsonandRichard Megginson 091570301d test: ensure role gathers the facts it uses by having test clear_facts before include_role
The role gathers the facts it uses.  For example, if the user uses
`ANSIBLE_GATHERING=explicit`, the role uses the `setup` module with the
facts and subsets it requires.

This change allows us to test this.  Before every role invocation, the test
will use `meta: clear_facts` so that the role starts with no facts.

Create a task file tests/tasks/run_role_with_clear_facts.yml to do the tasks
to clear the facts and run the role.  Note that this means we don't need to
use `gather_facts` for the tests.

Some vars defined using `ansible_facts` have been changed to be defined with
`set_fact` instead.  This is because of the fact that `vars` are lazily
evaluated - the var might be referenced when the facts have been cleared, and
will issue an error like `ansible_facts["distribution"] is undefined`.  This is
typically done for blocks that have a `when` condition that uses `ansible_facts`
and the block has a role invocation using run_role_with_clear_facts.yml
These have been rewritten to define the `when` condition using `set_fact`.  This
is because the `when` condition is evaluated every time a task is invoked in the
block, and if the facts are cleared, this will raise an undefined variable error.

Signed-off-by: Rich Megginson <rmeggins@redhat.com>
2026-03-19 09:18:34 -06:00
Rich MegginsonandRichard Megginson c9cd2fb359 refactor: handle INJECT_FACTS_AS_VARS=false by using ansible_facts instead
Ansible 2.20 has deprecated the use of Ansible facts as variables.  For
example, `ansible_distribution` is now deprecated in favor of
`ansible_facts["distribution"]`.  This is due to making the default
setting `INJECT_FACTS_AS_VARS=false`.  For now, this will create WARNING
messages, but in Ansible 2.24 it will be an error.

See https://docs.ansible.com/projects/ansible/latest/porting_guides/porting_guide_core_2.20.html#inject-facts-as-vars

Signed-off-by: Rich Megginson <rmeggins@redhat.com>
2026-01-07 09:29:52 -05:00
Rich MegginsonandRichard Megginson 189c7a6f85 fix: support new config file options, expose aide_version
Cause: The aide role custom config test is using the old configuration options
on newer EL9 systems which use AIDE version 0.17 and later.

Consequence: The test gives errors like "ERROR: /etc/aide.conf:12: unexpected character"
and the test fails.

Fix: The role will now determine the AIDE version, set the new aide_version variable,
and use this variable to determine the old or new style configuration.

Result: The aide system role can process custom config on all supported AIDE
versions.

See https://github.com/aide/aide/blob/master/ChangeLog#L241

Signed-off-by: Rich Megginson <rmeggins@redhat.com>
2025-11-24 09:26:37 -05:00
Rich MegginsonandRichard Megginson 7ebc20d774 refactor: fix Ansible 2.19 issues
Cannot write to ansible_managed - it is a special variable

Signed-off-by: Rich Megginson <rmeggins@redhat.com>
2025-06-26 13:40:09 -06:00
Joerg KastningandRichard Megginson 8ce6fe0da5 Changed ansible_db_template to ansible_config_template
As the template is for the aide.conf(5) file I found
that the variable name 'ansible_config_template' is
a better fit than 'ansible_db_template'.

Signed-off-by: Joerg Kastning <joerg@redhat.com>
2025-02-10 09:33:34 -07:00
Rich MegginsonandRichard Megginson cc5de8664f feat: ensure role works on ostree systems
Ensure role works on ostree systems

Signed-off-by: Rich Megginson <rmeggins@redhat.com>
2025-01-31 15:35:25 -07:00
Rich MegginsonandRichard Megginson 129feb1ac1 test: add cleanup for cron test; fix formatting
Ensure cron test restores state of crontab after test.
Fix formatting in a few places.
Do not check ansible managed header and fingerprint unless the test
uses a custom template with header and fingerprint.
Use default for gather_facts unless otherwise needed.

Signed-off-by: Rich Megginson <rmeggins@redhat.com>
2025-01-07 11:31:56 -07:00
Radovan SrokaandSergei Petrosian 2c0be7a450 Use command instead of shell
Signed-off-by: Radovan Sroka <rsroka@redhat.com>
2025-01-07 13:06:03 +01:00
Radovan SrokaandSergei Petrosian e9ddf8804c Fix suggestions
Signed-off-by: Radovan Sroka <rsroka@redhat.com>
2025-01-07 13:06:03 +01:00
Radovan SrokaandSergei Petrosian 49e267a29b feat: Allow setup aide inside of cron job
Signed-off-by: Radovan Sroka <rsroka@redhat.com>
2025-01-07 13:06:03 +01:00
Radovan SrokaandSergei Petrosian 75f11dfe94 Remove aide_install phase and do it uncoditionally
Signed-off-by: Radovan Sroka <rsroka@redhat.com>
2024-11-12 11:15:10 +01:00
Radovan SrokaandSergei Petrosian c4e5a2d8f0 Fix other suggestions
Signed-off-by: Radovan Sroka <rsroka@redhat.com>
2024-11-12 11:15:10 +01:00
Radovan SrokaandSergei Petrosian f11746b2d3 Added custom template functionality
Signed-off-by: Radovan Sroka <rsroka@redhat.com>
2024-11-12 11:15:10 +01:00
Radovan SrokaandSergei Petrosian 7826ac05c6 Switch from using tags to variables
Signed-off-by: Radovan Sroka <rsroka@redhat.com>
2024-11-12 11:15:10 +01:00
Radovan SrokaandSergei Petrosian b84e29c40e feat: Import code for role
Signed-off-by: Radovan Sroka <rsroka@redhat.com>
2024-11-12 11:15:10 +01:00
Rich MegginsonandRichard Megginson 1b526b93ea refactor: Use vars/RedHat_N.yml symlink for CentOS, Rocky, Alma wherever possible
We have a lot of requests to support Rocky and Alma in various system roles. The
first part of adding support is adding `vars/` files for these platforms. In
almost every case, for a given major version N, the vars file RedHat_N.yml can
be used for CentOS, Rocky, and Alma.  Rather than making a copy of the
RedHat_N.yml file, just use a symlink to reduce size and maintenance burden, and
standardize this across all system roles for consistency.

NOTE: There is no Alma or Rocky version 7 or less.

NOTE: OracleLinux is not a strict clone, so we are not going to do this for
OracleLinux at this time.  Support for OracleLinux will need to be done in
separate PRs. For more information, see
https://github.com/linux-system-roles/cockpit/issues/130

**Question**: Why not just use `ansible_facts["os_family"] == "RedHat"`?

**Answer**:  This is what Ansible uses as the RedHat os_family:
https://github.com/ansible/ansible/blob/1e6ffc1d02559a26def6c9c3b07baf27032865a2/lib/ansible/module_utils/facts/system/distribution.py#L511
There are a lot of distributions in there. I know that Fedora is not a clone of
RHEL, but it is very closely related. Most of the others are not clones, and it
would generally not work to replace ansible_distribution in ['CentOS', 'Fedora',
'RedHat'] with ansible_facts['os_family'] == 'RedHat' (but it would probably
work in specific cases with specific distributions).  For example, OracleLinux
is in there, and we know that doesn't generally work.  The only ones we can be
pretty sure about are `RedHat`, `CentOS`, `Fedora`, `AlmaLinux`, and `Rocky`.

**Question**: Does my role really need this because it should already work on
RHEL clones?

**Answer**: Maybe not - but:

* it doesn't hurt anything
* it's there if we need it in the future
* the role will be inconsistent with the other system roles if we don't have this

**Question**: Why do I need the `tests/vars/rh_distros_vars.yml` file?  Doesn't
the test load the vars from the role?

**Answer**: No, the test does not load the vars from the role until the role is
included, and many tests use version and distribution before including the role.

**Question**: Do we need to change the code now to use the new variables?

**Answer**: No, not now, in subsequent PRs, hopefully by Alma and Rocky users.

Note that there may be more work to be done to the role to fully support Rocky
and Alma.  Many roles have conditionals like this:

```yaml
some_var: "{{ 'some value' if ansible_distribution in ['CentOS', 'RedHat'] else 'other value' }}"
another_var: "{{ 'some value' if ansible_distribution in ['CentOS', 'Fedora', 'RedHat'] else 'other value' }}"

...

- name: Do something
  when: ansible_distribution in ['CentOS', 'RedHat']
  ...
- name: Do something else
  when: ansible_distribution in ['CentOS', 'Fedora', 'RedHat']
  ...
```

Adding Rocky and AlmaLinux to these conditionals will have to be done
separately. In order to simplify the task, some new variables are being
introduced:

```yaml
__$rolename_rh_distros:
  - AlmaLinux
  - CentOS
  - RedHat
  - Rocky

__$rolename_rh_distros_fedora: "{{ __$rolename_rh_distros + ['Fedora'] }}"

__$rolename_is_rh_distro: "{{ ansible_distribution in __$rolename_rh_distros }}"
__$rolename_is_rh_distro_fedora: "{{ ansible_distribution in __$rolename_rh_distros_fedora }}"
```

Then the conditionals can be rewritten as:

```yaml
some_var: "{{ 'some value' if __$rolename_is_rh_distro else 'other value' }}"
another_var: "{{ 'some value' if __$rolename_is_rh_distro_fedora else 'other value' }}"

...

- name: Do something
  when: __$rolename_is_rh_distro | bool
  ...
- name: Do something else
  when: __$rolename_is_rh_distro_fedora | bool
  ...
```

For tests - tests that use such conditionals will need to use `vars_files` or
`include_vars` to load the variables that are defined in
`tests/vars/rh_distros_vars.yml`:

```yaml
vars_files:
  - vars/rh_distros_vars.yml
```

We don't currently have CI testing for Rocky or Alma, so someone wanting to run
tests on those platforms would need to change the test code to use these.

Signed-off-by: Rich Megginson <rmeggins@redhat.com>
2024-10-25 14:08:09 -06:00
Richard MegginsonandGitHub e898442752 Initial commit 2024-10-22 10:07:09 -06:00