diff --git a/roles/ipaclient/tasks/main.yml b/roles/ipaclient/tasks/main.yml index 8840bb5feeca18927a3c8196cc880e3186fade6d..9824eaf4f0bc6aafbebe97ab3a07143913e1b1df 100644 --- a/roles/ipaclient/tasks/main.yml +++ b/roles/ipaclient/tasks/main.yml @@ -7,6 +7,13 @@ - "{{ role_path }}/vars/{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version'] }}.yml" - "{{ role_path }}/vars/{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_major_version'] }}.yml" - "{{ role_path }}/vars/{{ ansible_facts['distribution'] }}.yml" + # os_family is used as a fallback for distros which are not currently + # supported, but are based on a supported distro family. For example, + # Oracle, Rocky, Alma and Alibaba linux, which are all "RedHat" based. + - "vars/{{ ansible_facts['os_family'] }}-{{ ansible_facts['distribution_version'] }}.yml" + - "vars/{{ ansible_facts['os_family'] }}-{{ ansible_facts['distribution_major_version'] }}.yml" + - "vars/{{ ansible_facts['os_family'] }}.yml" + # If neither distro nor family is supported, try a default configuration. - "{{ role_path }}/vars/default.yml" - name: Install IPA client diff --git a/roles/ipaclient/vars/CentOS-8.yml b/roles/ipaclient/vars/CentOS-8.yml deleted file mode 120000 index d49e1cd5933d80e1140d65b1fcd941afebc661dd..0000000000000000000000000000000000000000 --- a/roles/ipaclient/vars/CentOS-8.yml +++ /dev/null @@ -1 +0,0 @@ -RedHat-8.yml \ No newline at end of file diff --git a/roles/ipaclient/vars/OracleLinux-7.yml b/roles/ipaclient/vars/OracleLinux-7.yml deleted file mode 120000 index 852b838dc369fbea945b46c9ab8bccff3cb344e3..0000000000000000000000000000000000000000 --- a/roles/ipaclient/vars/OracleLinux-7.yml +++ /dev/null @@ -1 +0,0 @@ -RedHat-7.yml \ No newline at end of file diff --git a/roles/ipaclient/vars/OracleLinux-8.yml b/roles/ipaclient/vars/OracleLinux-8.yml deleted file mode 120000 index d49e1cd5933d80e1140d65b1fcd941afebc661dd..0000000000000000000000000000000000000000 --- a/roles/ipaclient/vars/OracleLinux-8.yml +++ /dev/null @@ -1 +0,0 @@ -RedHat-8.yml \ No newline at end of file