Skip to content

Commit

Permalink
feat: support for ostree systems
Browse files Browse the repository at this point in the history
Feature: Allow running and testing the role with ostree managed nodes.

Reason: We have users who want to use the role to manage ostree
systems.

Result: Users can use the role to manage ostree managed nodes.
Signed-off-by: Rich Megginson <rmeggins@redhat.com>
  • Loading branch information
richm committed Nov 13, 2023
1 parent 0909900 commit 41fdc26
Show file tree
Hide file tree
Showing 38 changed files with 286 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ exclude_paths:
- examples/roles/
mock_roles:
- linux-system-roles.kernel_settings
mock_modules:
- ansible.utils.update_fact
3 changes: 3 additions & 0 deletions .ostree/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*NOTE*: The `*.txt` files are used by `get_ostree_data.sh` to create the lists
of packages, and to find other system roles used by this role. DO NOT use them
directly.
123 changes: 123 additions & 0 deletions .ostree/get_ostree_data.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
#!/bin/bash

set -euo pipefail

role_collection_dir="${ROLE_COLLECTION_DIR:-fedora/linux_system_roles}"
ostree_dir="${OSTREE_DIR:-"$(dirname "$(realpath "$0")")"}"

if [ -z "${4:-}" ] || [ "${1:-}" = help ] || [ "${1:-}" = -h ]; then
cat <<EOF
Usage: $0 packages [runtime|testing] DISTRO-MAJOR[.MINOR] [json|yaml|raw|toml]
The script will use the packages and roles files in $ostree_dir to
construct the list of packages needed to build the ostree image. The script
will output the list of packages in the given format
- json is a JSON list like ["pkg1","pkg2",....,"pkgN"]
- yaml is the YAML list format
- raw is the list of packages, one per line
- toml is a list of [[packages]] elements as in https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html-single/composing_installing_and_managing_rhel_for_edge_images/index#creating-an-image-builder-blueprint-for-a-rhel-for-edge-image-using-the-command-line-interface_composing-a-rhel-for-edge-image-using-image-builder-command-line
The DISTRO-MAJOR.MINOR is the same format used by Ansible for distribution e.g. CentOS-8, RedHat-8.9, etc.
EOF
exit 1
fi
category="$1"
pkgtype="$2"
distro_ver="$3"
format="$4"
pkgtypes=("$pkgtype")
if [ "$pkgtype" = testing ]; then
pkgtypes+=(runtime)
fi

get_rolepath() {
local ostree_dir role rolesdir roles_parent_dir
ostree_dir="$1"
role="$2"
roles_parent_dir="$(dirname "$(dirname "$ostree_dir")")"
rolesdir="$roles_parent_dir/$role/.ostree"
# assumes collection format
if [ -d "$rolesdir" ]; then
echo "$rolesdir"
return 0
fi
# assumes legacy role format like linux-system-roles.$role/
for rolesdir in "$roles_parent_dir"/*-system-roles."$role"/.ostree; do
if [ -d "$rolesdir" ]; then
echo "$rolesdir"
return 0
fi
done
# look elsewhere
if [ -n "${ANSIBLE_COLLECTIONS_PATHS:-}" ]; then
for pth in ${ANSIBLE_COLLECTIONS_PATHS//:/ }; do
rolesdir="$pth/ansible_collections/$role_collection_dir/roles/$role/.ostree"
if [ -d "$rolesdir" ]; then
echo "$rolesdir"
return 0
fi
done
fi
return 1
}

get_packages() {
local ostree_dir pkgtype pkgfile rolefile
ostree_dir="$1"
for pkgtype in "${pkgtypes[@]}"; do
for suff in "" "-$distro" "-${distro}-${major_ver}" "-${distro}-${ver}"; do
pkgfile="$ostree_dir/packages-${pkgtype}${suff}.txt"
if [ -f "$pkgfile" ]; then
cat "$pkgfile"
fi
done
rolefile="$ostree_dir/roles-${pkgtype}.txt"
if [ -f "$rolefile" ]; then
local roles role rolepath
roles="$(cat "$rolefile")"
for role in $roles; do
rolepath="$(get_rolepath "$ostree_dir" "$role")"
get_packages "$rolepath"
done
fi
done | sort -u
}

format_packages_json() {
local comma pkgs pkg
comma=""
pkgs="["
while read -r pkg; do
pkgs="${pkgs}${comma}\"${pkg}\""
comma=,
done
pkgs="${pkgs}]"
echo "$pkgs"
}

format_packages_raw() {
cat
}

format_packages_yaml() {
while read -r pkg; do
echo "- $pkg"
done
}

format_packages_toml() {
while read -r pkg; do
echo "[[packages]]"
echo "name = \"$pkg\""
echo "version = \"*\""
done
}

distro="${distro_ver%%-*}"
ver="${distro_ver##*-}"
if [[ "$ver" =~ ^([0-9]*) ]]; then
major_ver="${BASH_REMATCH[1]}"
else
echo ERROR: cannot parse major version number from version "$ver"
exit 1
fi

"get_$category" "$ostree_dir" | "format_${category}_$format"
1 change: 1 addition & 0 deletions .ostree/packages-runtime-CentOS-7.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-configobj
1 change: 1 addition & 0 deletions .ostree/packages-runtime-CentOS-8.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-configobj
1 change: 1 addition & 0 deletions .ostree/packages-runtime-CentOS-9.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-configobj
1 change: 1 addition & 0 deletions .ostree/packages-runtime-Fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-configobj
1 change: 1 addition & 0 deletions .ostree/packages-runtime-RedHat-7.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python-configobj
1 change: 1 addition & 0 deletions .ostree/packages-runtime-RedHat-8.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-configobj
1 change: 1 addition & 0 deletions .ostree/packages-runtime-RedHat-9.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-configobj
1 change: 1 addition & 0 deletions .ostree/packages-runtime.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tuned
2 changes: 2 additions & 0 deletions .ostree/packages-testing-CentOS-7.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
python
python-configobj
1 change: 1 addition & 0 deletions .ostree/packages-testing-CentOS-8.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-configobj
1 change: 1 addition & 0 deletions .ostree/packages-testing-CentOS-9.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-configobj
2 changes: 2 additions & 0 deletions .ostree/packages-testing-Fedora.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
python
python-configobj
2 changes: 2 additions & 0 deletions .ostree/packages-testing-RedHat-7.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
python
python-configobj
1 change: 1 addition & 0 deletions .ostree/packages-testing-RedHat-8.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-configobj
1 change: 1 addition & 0 deletions .ostree/packages-testing-RedHat-9.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python3-configobj
2 changes: 2 additions & 0 deletions .ostree/packages-testing.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
procps-ng
tuned
1 change: 1 addition & 0 deletions .sanity-ansible-ignore-2.10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ plugins/modules/kernel_settings.py validate-modules:missing-gplv3-license
plugins/modules/kernel_settings.py validate-modules:parameter-type-not-in-doc
plugins/modules/kernel_settings.py validate-modules:undocumented-parameter
plugins/modules/kernel_settings.py validate-modules:module-invalid-version-added
roles/kernel_settings/.ostree/get_ostree_data.sh shebang!skip
1 change: 1 addition & 0 deletions .sanity-ansible-ignore-2.11.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ plugins/modules/kernel_settings.py validate-modules:missing-gplv3-license
plugins/modules/kernel_settings.py validate-modules:parameter-type-not-in-doc
plugins/modules/kernel_settings.py validate-modules:undocumented-parameter
plugins/modules/kernel_settings.py validate-modules:module-invalid-version-added
roles/kernel_settings/.ostree/get_ostree_data.sh shebang!skip
1 change: 1 addition & 0 deletions .sanity-ansible-ignore-2.12.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ plugins/modules/kernel_settings.py validate-modules:missing-gplv3-license
plugins/modules/kernel_settings.py validate-modules:parameter-type-not-in-doc
plugins/modules/kernel_settings.py validate-modules:undocumented-parameter
plugins/modules/kernel_settings.py validate-modules:module-invalid-version-added
roles/kernel_settings/.ostree/get_ostree_data.sh shebang!skip
1 change: 1 addition & 0 deletions .sanity-ansible-ignore-2.13.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ plugins/modules/kernel_settings.py validate-modules:missing-gplv3-license
plugins/modules/kernel_settings.py validate-modules:parameter-type-not-in-doc
plugins/modules/kernel_settings.py validate-modules:undocumented-parameter
plugins/modules/kernel_settings.py validate-modules:module-invalid-version-added
roles/kernel_settings/.ostree/get_ostree_data.sh shebang!skip
1 change: 1 addition & 0 deletions .sanity-ansible-ignore-2.14.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ plugins/modules/kernel_settings.py validate-modules:missing-gplv3-license
plugins/modules/kernel_settings.py validate-modules:parameter-type-not-in-doc
plugins/modules/kernel_settings.py validate-modules:undocumented-parameter
plugins/modules/kernel_settings.py validate-modules:module-invalid-version-added
roles/kernel_settings/.ostree/get_ostree_data.sh shebang!skip
1 change: 1 addition & 0 deletions .sanity-ansible-ignore-2.15.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ plugins/modules/kernel_settings.py validate-modules:missing-gplv3-license
plugins/modules/kernel_settings.py validate-modules:parameter-type-not-in-doc
plugins/modules/kernel_settings.py validate-modules:undocumented-parameter
plugins/modules/kernel_settings.py validate-modules:module-invalid-version-added
roles/kernel_settings/.ostree/get_ostree_data.sh shebang!skip
1 change: 1 addition & 0 deletions .sanity-ansible-ignore-2.9.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ tests/kernel_settings/run_ansible_for_testing.sh shebang!skip
plugins/modules/kernel_settings.py validate-modules:missing-gplv3-license
plugins/modules/kernel_settings.py validate-modules:parameter-type-not-in-doc
plugins/modules/kernel_settings.py validate-modules:undocumented-parameter
roles/kernel_settings/.ostree/get_ostree_data.sh shebang!skip
66 changes: 66 additions & 0 deletions README-ostree.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# rpm-ostree

The role supports running on [rpm-ostree](https://coreos.github.io/rpm-ostree/)
systems. The primary issue is that the `/usr` filesystem is read-only, and the
role cannot install packages. Instead, it will just verify that the necessary
packages and any other `/usr` files are pre-installed. The role will change the
package manager to one that is compatible with `rpm-ostree` systems.

## Building

To build an ostree image for a particular operating system distribution and
version, use the script `.ostree/get_ostree_data.sh` to get the list of
packages. If the role uses other system roles, then the script will include the
packages for the other roles in the list it outputs. The list of packages will
be sorted in alphanumeric order.

Usage:

```bash
.ostree/get_ostree_data.sh packages runtime DISTRO-VERSION FORMAT
```

`DISTRO-VERSION` is in the format that Ansible uses for `ansible_distribution`
and `ansible_distribution_version` - for example, `Fedora-38`, `CentOS-8`,
`RedHat-9.4`

`FORMAT` is one of `toml`, `json`, `yaml`, `raw`

* `toml` - each package in a TOML `[[packages]]` element

```toml
[[packages]]
name = "package-a"
version = "*"
[[packages]]
name = "package-b"
version = "*"
...
```

* `yaml` - a YAML list of packages

```yaml
- package-a
- package-b
...
```

* `json` - a JSON list of packages

```json
["package-a","package-b",...]
```

* `raw` - a plain text list of packages, one per line

```bash
package-a
package-b
...
```

What format you choose depends on which image builder you are using. For
example, if you are using something based on
[osbuild-composer](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html-single/composing_installing_and_managing_rhel_for_edge_images/index#creating-an-image-builder-blueprint-for-a-rhel-for-edge-image-using-the-command-line-interface_composing-a-rhel-for-edge-image-using-image-builder-command-line),
you will probably want to use the `toml` output format.
16 changes: 15 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,17 @@ CentOS) and Fedora.

## Requirements

None
See below

### Collection requirements

If you want to manage `rpm-ostree` systems with this role, you will need to
install additional collections. Please run the following command line to
install the collection.

```bash
ansible-galaxy collection install -vv -r meta/collection-requirements.yml
```

## Role Variables

Expand Down Expand Up @@ -269,6 +279,10 @@ system package, they may set the same values you are setting with the
For all other settings such as `sysfs`, the settings from `kernel_settings` role
have the highest precedence.

## rpm-ostree

See README-ostree.md

## License

Some parts related to `tuned` are `GPLv2+`. These are noted in the headers
Expand Down
5 changes: 5 additions & 0 deletions meta/collection-requirements.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# SPDX-License-Identifier: MIT
---
collections:
- ansible.posix
- ansible.utils
18 changes: 18 additions & 0 deletions tasks/set_vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,24 @@
when: __kernel_settings_required_facts |
difference(ansible_facts.keys() | list) | length > 0

- name: Ensure correct package manager for ostree systems
vars:
ostree_pkg_mgr: ansible.posix.rhel_rpm_ostree
ostree_booted_file: /run/ostree-booted
when: ansible_facts.pkg_mgr | d("") != ostree_pkg_mgr
block:
- name: Check if system is ostree
stat:
path: "{{ ostree_booted_file }}"
register: __ostree_booted_stat

- name: Set package manager to use for ostree
ansible.utils.update_fact:
updates:
- path: ansible_facts.pkg_mgr
value: "{{ ostree_pkg_mgr }}"
when: __ostree_booted_stat.stat.exists

- name: Set platform/version specific variables
include_vars: "{{ lookup('first_found', ffparams) }}"
vars:
Expand Down
1 change: 1 addition & 0 deletions tests/tasks/assert_kernel_settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
files:
- "tests_{{ ansible_distribution }}_\
{{ ansible_distribution_major_version }}.yml"
- "tests_{{ ansible_distribution }}.yml"
- "tests_default.yml"
paths:
- vars
Expand Down
18 changes: 18 additions & 0 deletions tests/tests_change_settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,24 @@
tags:
- tests::reboot
tasks:
- name: Ensure correct package manager for ostree systems
vars:
ostree_pkg_mgr: ansible.posix.rhel_rpm_ostree
ostree_booted_file: /run/ostree-booted
when: ansible_facts.pkg_mgr | d("") != ostree_pkg_mgr
block:
- name: Check if system is ostree
stat:
path: "{{ ostree_booted_file }}"
register: __ostree_booted_stat

- name: Set package manager to use for ostree
ansible.utils.update_fact:
updates:
- path: ansible_facts.pkg_mgr
value: "{{ ostree_pkg_mgr }}"
when: __ostree_booted_stat.stat.exists

# procps-ng for sysctl cmd
- name: Ensure required packages are installed
package:
Expand Down
3 changes: 3 additions & 0 deletions tests/vars/tests_CentOS_7.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
__kernel_settings_test_python_pkgs: ['python', 'python-configobj']
__kernel_settings_test_python_cmd: python
File renamed without changes.
3 changes: 3 additions & 0 deletions tests/vars/tests_RedHat_7.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
__kernel_settings_test_python_pkgs: ['python', 'python-configobj']
__kernel_settings_test_python_cmd: python
3 changes: 0 additions & 3 deletions tests/vars/tests_RedHat_8.yml

This file was deleted.

3 changes: 0 additions & 3 deletions tests/vars/tests_RedHat_9.yml

This file was deleted.

4 changes: 2 additions & 2 deletions tests/vars/tests_default.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
__kernel_settings_test_python_pkgs: ['python', 'python-configobj']
__kernel_settings_test_python_cmd: python
__kernel_settings_test_python_pkgs: ['python3-configobj']
__kernel_settings_test_python_cmd: /usr/libexec/platform-python

0 comments on commit 41fdc26

Please sign in to comment.