From 895a887701ac5d02689e45434ae92203843f72a3 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Mon, 2 Oct 2017 17:12:15 +0200
Subject: [PATCH] Add support for Python3 based freeipa versions (F-27+), make
Python3 default
Add configuration for F-26, F-27 and RHEL-7 to be Python2 based
---
roles/ipaclient/tasks/main.yml | 6 ++++--
roles/ipaclient/vars/Fedora-25.yml | 2 ++
roles/ipaclient/vars/Fedora-26.yml | 2 ++
roles/ipaclient/vars/RedHat-7.yml | 5 +++++
roles/ipaclient/vars/default.yml | 3 ++-
5 files changed, 15 insertions(+), 3 deletions(-)
create mode 100644 roles/ipaclient/vars/Fedora-25.yml
create mode 100644 roles/ipaclient/vars/Fedora-26.yml
create mode 100644 roles/ipaclient/vars/RedHat-7.yml
diff --git a/roles/ipaclient/tasks/main.yml b/roles/ipaclient/tasks/main.yml
index 152f1c58..36de32d2 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 00000000..4734e072
--- /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 00000000..4734e072
--- /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 00000000..8d551f36
--- /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 eb675d4b..287e7997 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'
--
GitLab