From b91af7ff728efc8ac62668bad123bd512316dad0 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Tue, 14 Nov 2023 10:50:54 -0700 Subject: [PATCH] feat: support for ostree systems 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 --- .ansible-lint | 2 + .ostree/README.md | 3 + .ostree/get_ostree_data.sh | 123 ++++++++++++++++++++++++++ .ostree/packages-runtime.txt | 2 + .ostree/packages-testing-CentOS-7.txt | 3 + .ostree/packages-testing-CentOS-8.txt | 3 + .ostree/packages-testing-CentOS-9.txt | 3 + .ostree/packages-testing-Fedora.txt | 3 + .ostree/packages-testing-RedHat-7.txt | 3 + .ostree/packages-testing-RedHat-8.txt | 3 + .ostree/packages-testing-RedHat-9.txt | 3 + .sanity-ansible-ignore-2.12.txt | 1 + .sanity-ansible-ignore-2.13.txt | 1 + .sanity-ansible-ignore-2.14.txt | 1 + .sanity-ansible-ignore-2.15.txt | 1 + .sanity-ansible-ignore-2.9.txt | 1 + README-ostree.md | 66 ++++++++++++++ README.md | 13 +++ meta/collection-requirements.yml | 5 ++ tasks/set_vars.yml | 18 ++++ tests/tasks/setup.yml | 18 ++++ tests/tests_all_options.yml | 21 ++++- 22 files changed, 296 insertions(+), 1 deletion(-) create mode 100644 .ostree/README.md create mode 100755 .ostree/get_ostree_data.sh create mode 100644 .ostree/packages-runtime.txt create mode 100644 .ostree/packages-testing-CentOS-7.txt create mode 100644 .ostree/packages-testing-CentOS-8.txt create mode 100644 .ostree/packages-testing-CentOS-9.txt create mode 100644 .ostree/packages-testing-Fedora.txt create mode 100644 .ostree/packages-testing-RedHat-7.txt create mode 100644 .ostree/packages-testing-RedHat-8.txt create mode 100644 .ostree/packages-testing-RedHat-9.txt create mode 100644 .sanity-ansible-ignore-2.12.txt create mode 100644 .sanity-ansible-ignore-2.13.txt create mode 100644 .sanity-ansible-ignore-2.14.txt create mode 100644 .sanity-ansible-ignore-2.15.txt create mode 100644 .sanity-ansible-ignore-2.9.txt create mode 100644 README-ostree.md create mode 100644 meta/collection-requirements.yml diff --git a/.ansible-lint b/.ansible-lint index c3b2561..f61d187 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -22,3 +22,5 @@ exclude_paths: - examples/roles/ mock_roles: - linux-system-roles.ssh +mock_modules: + - ansible.utils.update_fact diff --git a/.ostree/README.md b/.ostree/README.md new file mode 100644 index 0000000..f5e6931 --- /dev/null +++ b/.ostree/README.md @@ -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. diff --git a/.ostree/get_ostree_data.sh b/.ostree/get_ostree_data.sh new file mode 100755 index 0000000..7c32524 --- /dev/null +++ b/.ostree/get_ostree_data.sh @@ -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 < 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: "{{ __vars_file }}" loop: diff --git a/tests/tasks/setup.yml b/tests/tasks/setup.yml index 9b6cd6d..c16a4d7 100644 --- a/tests/tasks/setup.yml +++ b/tests/tasks/setup.yml @@ -4,6 +4,24 @@ gather_subset: min when: "'os_family' not in ansible_facts" +- 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: Make sure openssh is installed before creating backup vars: __ssh_test_packages: >- diff --git a/tests/tests_all_options.yml b/tests/tests_all_options.yml index 402198b..34c8829 100644 --- a/tests/tests_all_options.yml +++ b/tests/tests_all_options.yml @@ -22,10 +22,29 @@ when: > ansible_facts['os_family'] != 'RedHat' + - 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: Make sure manual pages and bash are installed package: name: - - man + - "{{ (ansible_facts['os_family'] == 'RedHat') | + ternary('man-db', 'man') }}" - bash - "{{ ssh_test_package }}" state: present