From 990da8341f14752b9375cadacec68c70d97c9c33 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Wed, 4 Oct 2017 17:22:40 +0200
Subject: [PATCH] ipaclient vars: Renamed ipaclient_package to
ipaclient_packages
The rename was needed to be able to have more than one package in the list
of required packages.
For RHEL-7.3 it has been needed to add ipa-admintools to have /usr/bin/ipa
available. libselinux-python has been added for all.
---
roles/ipaclient/tasks/install.yml | 3 ++-
roles/ipaclient/tasks/uninstall.yml | 3 ++-
roles/ipaclient/vars/Fedora-25.yml | 2 +-
roles/ipaclient/vars/Fedora-26.yml | 2 +-
roles/ipaclient/vars/RedHat-7.3.yml | 4 ++++
roles/ipaclient/vars/RedHat-7.yml | 3 +--
roles/ipaclient/vars/default.yml | 2 +-
7 files changed, 12 insertions(+), 7 deletions(-)
create mode 100644 roles/ipaclient/vars/RedHat-7.3.yml
diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml
index 1f6dd6e1..920d1cac 100644
--- a/roles/ipaclient/tasks/install.yml
+++ b/roles/ipaclient/tasks/install.yml
@@ -3,8 +3,9 @@
- name: Install - Install IPA client package
package:
- name: "{{ ipaclient_package }}"
+ name: "{{ item }}"
state: present
+ with_items: "{{ ipaclient_packages }}"
- name: Install - IPA discovery
ipadiscovery:
diff --git a/roles/ipaclient/tasks/uninstall.yml b/roles/ipaclient/tasks/uninstall.yml
index 8fd3d4b6..acd0e543 100644
--- a/roles/ipaclient/tasks/uninstall.yml
+++ b/roles/ipaclient/tasks/uninstall.yml
@@ -7,5 +7,6 @@
#- name: Remove IPA client package
# package:
-# name: "{{ ipaclient_package }}"
+# name: "{{ item }}"
# state: absent
+# with_items: "{{ ipaclient_packages }}"
diff --git a/roles/ipaclient/vars/Fedora-25.yml b/roles/ipaclient/vars/Fedora-25.yml
index 4734e072..064ca8bf 100644
--- a/roles/ipaclient/vars/Fedora-25.yml
+++ b/roles/ipaclient/vars/Fedora-25.yml
@@ -1,2 +1,2 @@
-ipaclient_package: python2-ipaclient
+ipaclient_packages: [ "ipa-client", "libselinux-python" ]
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
index 4734e072..064ca8bf 100644
--- a/roles/ipaclient/vars/Fedora-26.yml
+++ b/roles/ipaclient/vars/Fedora-26.yml
@@ -1,2 +1,2 @@
-ipaclient_package: python2-ipaclient
+ipaclient_packages: [ "ipa-client", "libselinux-python" ]
ansible_python_interpreter: '/usr/bin/python2'
\ No newline at end of file
diff --git a/roles/ipaclient/vars/RedHat-7.3.yml b/roles/ipaclient/vars/RedHat-7.3.yml
new file mode 100644
index 00000000..888aceae
--- /dev/null
+++ b/roles/ipaclient/vars/RedHat-7.3.yml
@@ -0,0 +1,4 @@
+# defaults file for ipaclient
+# vars/rhel.yml
+ipaclient_packages: [ "ipa-client", "ipa-admintools", "libselinux-python" ]
+ansible_python_interpreter: '/usr/bin/python2'
diff --git a/roles/ipaclient/vars/RedHat-7.yml b/roles/ipaclient/vars/RedHat-7.yml
index 8d551f36..3f32a1bd 100644
--- a/roles/ipaclient/vars/RedHat-7.yml
+++ b/roles/ipaclient/vars/RedHat-7.yml
@@ -1,5 +1,4 @@
# defaults file for ipaclient
# vars/rhel.yml
-ipaclient_package: ipa-client
+ipaclient_packages: [ "ipa-client", "libselinux-python" ]
ansible_python_interpreter: '/usr/bin/python2'
-
diff --git a/roles/ipaclient/vars/default.yml b/roles/ipaclient/vars/default.yml
index 287e7997..81c13a98 100644
--- a/roles/ipaclient/vars/default.yml
+++ b/roles/ipaclient/vars/default.yml
@@ -1,4 +1,4 @@
# defaults file for ipaclient
# vars/default.yml
-ipaclient_package: python3-ipaclient
+ipaclient_packages: [ "ipa-client", "libselinux-python" ]
ansible_python_interpreter: '/usr/bin/python3'
--
GitLab