From 77d0a1067afffab673e49a0adbcbd4a9f024d32e Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 12 Feb 2019 13:22:28 +0100
Subject: [PATCH] ipa[server,replica,client]: New setting X_install_packages

With these settings for server, replica and client it is possible to skip
package installation. This is for example useful if the packages are already
installed. The settings default to yes

The setting ipareplica_no_package_install has been removed.
---
 roles/ipaclient/defaults/main.yml  |  3 +++
 roles/ipaclient/tasks/install.yml  |  1 +
 roles/ipareplica/defaults/main.yml |  3 ++-
 roles/ipareplica/tasks/install.yml | 39 ++++++++++++++++--------------
 roles/ipaserver/defaults/main.yml  |  2 ++
 roles/ipaserver/tasks/install.yml  | 37 +++++++++++++++-------------
 6 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/roles/ipaclient/defaults/main.yml b/roles/ipaclient/defaults/main.yml
index da013cfd..70fba022 100644
--- a/roles/ipaclient/defaults/main.yml
+++ b/roles/ipaclient/defaults/main.yml
@@ -11,3 +11,6 @@ ipaclient_on_master: no
 ipaclient_no_ntp: no
 ipaclient_no_dns_lookup: no
 ipaclient_ssh_trust_dns: no
+
+### packages ###
+ipaclient_install_packages: yes
\ No newline at end of file
diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml
index 24493633..f609fbb2 100644
--- a/roles/ipaclient/tasks/install.yml
+++ b/roles/ipaclient/tasks/install.yml
@@ -6,6 +6,7 @@
     name: "{{ item }}"
     state: present
   with_items: "{{ ipaclient_packages }}"
+  when: ipaclient_install_packages | bool
 
 - name: Install - Include Python2/3 import test
   import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
diff --git a/roles/ipareplica/defaults/main.yml b/roles/ipareplica/defaults/main.yml
index 5314df5c..a9dc4f91 100644
--- a/roles/ipareplica/defaults/main.yml
+++ b/roles/ipareplica/defaults/main.yml
@@ -37,5 +37,6 @@ ipareplica_enable_compat: no
 ipareplica_ignore_topology_disconnect: no
 ipareplica_ignore_last_of_role: no
 ### additional ###
-ipareplica_no_package_install: no
+### packages ###
+ipareplica_install_packages: yes
 ipareplica_no_firewalld: no
diff --git a/roles/ipareplica/tasks/install.yml b/roles/ipareplica/tasks/install.yml
index 99f96e71..263fd8c6 100644
--- a/roles/ipareplica/tasks/install.yml
+++ b/roles/ipareplica/tasks/install.yml
@@ -1,26 +1,29 @@
 ---
 # tasks file for ipareplica
 
-- name: Install - Ensure IPA replica packages are installed
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items: "{{ ipareplica_packages }}"
-  when: not ipareplica_no_package_install | bool
+- block:
 
-- name: Install - Ensure IPA replica packages for dns are installed
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items: "{{ ipareplica_packages_dns }}"
-  when: not ipareplica_no_package_install | bool and ipareplica_setup_dns | bool
+  - name: Install - Ensure IPA replica packages are installed
+    package:
+      name: "{{ item }}"
+      state: present
+    with_items: "{{ ipareplica_packages }}"
 
-- name: Install - Ensure IPA replica packages for adtrust are installed
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items: "{{ ipareplica_packages_adtrust }}"
-  when: not ipareplica_no_package_install | bool and ipareplica_setup_adtrust | bool
+  - name: Install - Ensure IPA replica packages for dns are installed
+    package:
+      name: "{{ item }}"
+      state: present
+    with_items: "{{ ipareplica_packages_dns }}"
+    when: ipareplica_setup_dns | bool
+
+  - name: Install - Ensure IPA replica packages for adtrust are installed
+    package:
+      name: "{{ item }}"
+      state: present
+    with_items: "{{ ipareplica_packages_adtrust }}"
+    when: ipareplica_setup_adtrust | bool
+
+  when: ipareplica_install_packages | bool
 
 - name: Install - Include Python2/3 import test
   import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
diff --git a/roles/ipaserver/defaults/main.yml b/roles/ipaserver/defaults/main.yml
index b2ff174c..edf3c5d3 100644
--- a/roles/ipaserver/defaults/main.yml
+++ b/roles/ipaserver/defaults/main.yml
@@ -30,6 +30,8 @@ ipaserver_no_dnssec_validation: no
 ### ad trust ###
 ipaserver_enable_compat: no
 ipaserver_setup_ca: yes
+### packages ###
+ipaserver_install_packages: yes
 ### firewalld ###
 ipaserver_no_firewalld: no
 
diff --git a/roles/ipaserver/tasks/install.yml b/roles/ipaserver/tasks/install.yml
index e42ee03c..196a64d8 100644
--- a/roles/ipaserver/tasks/install.yml
+++ b/roles/ipaserver/tasks/install.yml
@@ -1,25 +1,28 @@
 ---
 # tasks file for ipaserver
 
-- name: Install - Ensure that IPA server packages are installed
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items: "{{ ipaserver_packages }}"
+- block:
+  - name: Install - Ensure that IPA server packages are installed
+    package:
+      name: "{{ item }}"
+      state: present
+    with_items: "{{ ipaserver_packages }}"
 
-- name: Install - Ensure that IPA server packages for dns are installed
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items: "{{ ipaserver_packages_dns }}"
-  when: ipaserver_setup_dns | bool
+  - name: Install - Ensure that IPA server packages for dns are installed
+    package:
+      name: "{{ item }}"
+      state: present
+    with_items: "{{ ipaserver_packages_dns }}"
+    when: ipaserver_setup_dns | bool
 
-- name: Install - Ensure that IPA server packages for adtrust are installed
-  package:
-    name: "{{ item }}"
-    state: present
-  with_items: "{{ ipaserver_packages_adtrust }}"
-  when: ipaserver_setup_adtrust | bool
+  - name: Install - Ensure that IPA server packages for adtrust are installed
+    package:
+      name: "{{ item }}"
+      state: present
+    with_items: "{{ ipaserver_packages_adtrust }}"
+    when: ipaserver_setup_adtrust | bool
+
+  when: ipaserver_install_packages | bool
 
 - name: Install - Include Python2/3 import test
   import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"