Skip to content

Commit aa4b8db

Browse files
committed
fix: add initial support for sle16+
1 parent f23d29c commit aa4b8db

2 files changed

Lines changed: 11 additions & 5 deletions

File tree

defaults/main.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,19 @@ __network_packages_default_wpa_supplicant: ["{%
7575
# distribution:
7676
# - python-gobject-base on RHEL7 (no python2-gobject-base :-/)
7777
# - python3-gobject-base on Fedora 28+
78+
# - python3-gobject on SUSE 16+ (no -base suffix)
7879
__network_packages_default_gobject_packages: ["python{{
79-
ansible_facts['python']['version']['major'] | replace('2', '') }}-gobject-base"]
80+
ansible_facts['python']['version']['major'] | replace('2', '') }}-gobject{{
81+
'' if ansible_facts['os_family'] | d('') == 'Suse' else '-base' }}"]
8082

8183
__network_service_name_default_nm: NetworkManager
8284
__network_packages_default_nm: "{{ ['NetworkManager']
8385
+ __network_packages_default_gobject_packages | select() | list()
8486
+ __network_packages_default_wpa_supplicant | select() | list()
8587
+ __network_packages_default_wireless | select() | list()
86-
+ __network_packages_default_team | select() | list() }}"
88+
+ __network_packages_default_team | select() | list()
89+
+ (['typelib-1_0-NM-1_0']
90+
if ansible_facts['os_family'] | d('') == 'Suse' else []) }}"
8791

8892
__network_service_name_default_initscripts: network
8993

tasks/main.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,17 @@
2626
- ansible_facts["distribution_major_version"] | int < 8
2727

2828
- name: Abort applying teaming configuration if the system version
29-
of the managed host is EL10 or later
29+
of the managed host is EL10 or later, or SUSE 16 or later
3030
fail:
3131
msg: >-
3232
Teaming is not supported in
3333
{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }} -
3434
use bonding instead
3535
when:
36-
- ansible_facts["distribution_major_version"] | int > 9
37-
- ansible_facts["distribution"] in __network_rh_distros
36+
- (ansible_facts["distribution_major_version"] | int > 9 and
37+
ansible_facts["distribution"] in __network_rh_distros) or
38+
(ansible_facts["distribution_major_version"] | int >= 16 and
39+
ansible_facts["os_family"] == "Suse")
3840
- network_connections | selectattr("type", "defined") |
3941
selectattr("type", "match", "^team$") | list | length > 0 or
4042
network_state.get("interfaces", []) | selectattr("type", "defined") |

0 commit comments

Comments
 (0)