diff --git a/roles/ipaclient/tasks/main.yml b/roles/ipaclient/tasks/main.yml index 152f1c58967934b0fb5b337ac9aa88b0b62bb15e..36de32d25938872d2b50ebb56da3c0602c215ac8 100644 --- a/roles/ipaclient/tasks/main.yml +++ b/roles/ipaclient/tasks/main.yml @@ -4,8 +4,10 @@ - name: Import variables specific to distribution include_vars: "{{ item }}" with_first_found: - - vars/{{ ansible_distribution }}.yml - - vars/default.yml + - "vars/{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml" + - "vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml" + - "vars/{{ ansible_distribution }}.yml" + - "vars/default.yml" - name: Install IPA client include: tasks/install.yml diff --git a/roles/ipaclient/vars/Fedora-25.yml b/roles/ipaclient/vars/Fedora-25.yml new file mode 100644 index 0000000000000000000000000000000000000000..4734e072770882d72b84b5ac3a80bdca873e2995 --- /dev/null +++ b/roles/ipaclient/vars/Fedora-25.yml @@ -0,0 +1,2 @@ +ipaclient_package: python2-ipaclient +ansible_python_interpreter: '/usr/bin/python2' \ No newline at end of file diff --git a/roles/ipaclient/vars/Fedora-26.yml b/roles/ipaclient/vars/Fedora-26.yml new file mode 100644 index 0000000000000000000000000000000000000000..4734e072770882d72b84b5ac3a80bdca873e2995 --- /dev/null +++ b/roles/ipaclient/vars/Fedora-26.yml @@ -0,0 +1,2 @@ +ipaclient_package: python2-ipaclient +ansible_python_interpreter: '/usr/bin/python2' \ No newline at end of file diff --git a/roles/ipaclient/vars/RedHat-7.yml b/roles/ipaclient/vars/RedHat-7.yml new file mode 100644 index 0000000000000000000000000000000000000000..8d551f36703fbf4bf41f3cc9acf0a88850631fa1 --- /dev/null +++ b/roles/ipaclient/vars/RedHat-7.yml @@ -0,0 +1,5 @@ +# defaults file for ipaclient +# vars/rhel.yml +ipaclient_package: ipa-client +ansible_python_interpreter: '/usr/bin/python2' + diff --git a/roles/ipaclient/vars/default.yml b/roles/ipaclient/vars/default.yml index eb675d4bf87f32eb30fc56a444447e49a8fbb016..287e799782cda6c20611db933566eb4548aaf6c0 100644 --- a/roles/ipaclient/vars/default.yml +++ b/roles/ipaclient/vars/default.yml @@ -1,3 +1,4 @@ # defaults file for ipaclient # vars/default.yml -ipaclient_package: freeipa-client +ipaclient_package: python3-ipaclient +ansible_python_interpreter: '/usr/bin/python3'