diff --git a/.ostree/packages-runtime-CentOS-10.txt b/.ostree/packages-runtime-CentOS-10.txt new file mode 100644 index 000000000..fb17c611a --- /dev/null +++ b/.ostree/packages-runtime-CentOS-10.txt @@ -0,0 +1,3 @@ +nmstate +python3-gobject-base +python3-libnmstate diff --git a/.ostree/packages-runtime-RedHat-10.txt b/.ostree/packages-runtime-RedHat-10.txt new file mode 100644 index 000000000..fb17c611a --- /dev/null +++ b/.ostree/packages-runtime-RedHat-10.txt @@ -0,0 +1,3 @@ +nmstate +python3-gobject-base +python3-libnmstate diff --git a/.ostree/packages-testing-CentOS-10.txt b/.ostree/packages-testing-CentOS-10.txt new file mode 100644 index 000000000..2f56f26a8 --- /dev/null +++ b/.ostree/packages-testing-CentOS-10.txt @@ -0,0 +1,4 @@ +ethtool +NetworkManager +procps-ng +systemd-resolved diff --git a/.ostree/packages-testing-RedHat-10.txt b/.ostree/packages-testing-RedHat-10.txt new file mode 100644 index 000000000..2f56f26a8 --- /dev/null +++ b/.ostree/packages-testing-RedHat-10.txt @@ -0,0 +1,4 @@ +ethtool +NetworkManager +procps-ng +systemd-resolved diff --git a/meta/main.yml b/meta/main.yml index 9644af27b..5b75bd14d 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -6,14 +6,6 @@ galaxy_info: company: Red Hat, Inc. license: BSD-3-Clause min_ansible_version: "2.9" - galaxy_tags: - - centos - - fedora - - network - - networking - - redhat - - rhel - - system platforms: - name: Fedora versions: @@ -24,3 +16,16 @@ galaxy_info: - "7" - "8" - "9" + galaxy_tags: + - centos + - el6 + - el7 + - el8 + - el9 + - el10 + - fedora + - network + - networking + - redhat + - rhel + - system diff --git a/tasks/main.yml b/tasks/main.yml index a26c504b3..df3841129 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -25,6 +25,21 @@ - network_state is defined - ansible_distribution_major_version | int < 8 +- name: Abort applying teaming configuration if the system version + of the managed host is EL10 or later + fail: + msg: >- + Teaming is not supported in + {{ ansible_distribution }}-{{ ansible_distribution_major_version }} - + use bonding instead + when: + - ansible_distribution_major_version | int > 9 + - ansible_distribution in __network_rh_distros + - network_connections | selectattr("type", "match", "^team$") | list | + length > 0 or + network_state | selectattr("type", "match", "^team$") | list | + length > 0 + - name: Check if updates for network packages are available through the DNF package manager due to wireless or team interfaces dnf: diff --git a/tests/ensure_provider_tests.py b/tests/ensure_provider_tests.py index 105c6c0a1..23c730f21 100755 --- a/tests/ensure_provider_tests.py +++ b/tests/ensure_provider_tests.py @@ -101,8 +101,15 @@ blackhole, prohibit and unreachable", }, "playbooks/tests_routing_rules.yml": {}, - "playbooks/tests_team.yml": {}, - "playbooks/tests_team_plugin_installation.yml": {}, + # teaming support dropped in EL10 + "playbooks/tests_team.yml": { + EXTRA_RUN_CONDITION: "ansible_distribution not in ['RedHat', 'CentOS'] or\n ansible_distr\ +ibution_major_version | int < 10", + }, + "playbooks/tests_team_plugin_installation.yml": { + EXTRA_RUN_CONDITION: "ansible_distribution not in ['RedHat', 'CentOS'] or\n ansible_distr\ +ibution_major_version | int < 10", + }, # mac80211_hwsim (used for tests_wireless) only seems to be available # and working on RHEL/CentOS 7 "playbooks/tests_wireless.yml": { diff --git a/tests/tests_team_nm.yml b/tests/tests_team_nm.yml index 797d46fed..9854133f4 100644 --- a/tests/tests_team_nm.yml +++ b/tests/tests_team_nm.yml @@ -21,3 +21,5 @@ import_playbook: playbooks/tests_team.yml when: - ansible_distribution_major_version != '6' + - ansible_distribution not in ['RedHat', 'CentOS'] or + ansible_distribution_major_version | int < 10 diff --git a/tests/tests_team_plugin_installation_nm.yml b/tests/tests_team_plugin_installation_nm.yml index 46b3801dd..cc97cbb5c 100644 --- a/tests/tests_team_plugin_installation_nm.yml +++ b/tests/tests_team_plugin_installation_nm.yml @@ -21,3 +21,5 @@ import_playbook: playbooks/tests_team_plugin_installation.yml when: - ansible_distribution_major_version != '6' + - ansible_distribution not in ['RedHat', 'CentOS'] or + ansible_distribution_major_version | int < 10