diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml index d9849cc5a9f5df92afd1b089a4da3dfffb8711bb..906a692598739e9254d4c68d80ed3445e90206dc 100644 --- a/roles/ipaclient/tasks/install.yml +++ b/roles/ipaclient/tasks/install.yml @@ -3,9 +3,8 @@ - name: Install - Ensure that IPA client packages are installed package: - name: "{{ item }}" + name: "{{ ipaclient_packages }}" state: present - with_items: "{{ ipaclient_packages }}" when: ipaclient_install_packages | bool #- name: Install - Include Python2/3 import test diff --git a/roles/ipaclient/tasks/uninstall.yml b/roles/ipaclient/tasks/uninstall.yml index cf49d2c4c4c67daa050b1fbfa9a93dd86447fa06..095099a37f31608d62b599a1e3d0133be790fb43 100644 --- a/roles/ipaclient/tasks/uninstall.yml +++ b/roles/ipaclient/tasks/uninstall.yml @@ -14,8 +14,7 @@ failed_when: uninstall.rc != 0 and uninstall.rc != 2 changed_when: uninstall.rc == 0 -# - name: Remove IPA client package -# package: -# name: "{{ item }}" -# state: absent -# with_items: "{{ ipaclient_packages }}" +#- name: Remove IPA client package +# package: +# name: "{{ ipaclient_packages }}" +# state: absent diff --git a/roles/ipareplica/tasks/install.yml b/roles/ipareplica/tasks/install.yml index 64e3e4260dd06f30d21b6a14db7257a50094a8cf..9acf558fe9c205da77df57baa52657b78713e6c3 100644 --- a/roles/ipareplica/tasks/install.yml +++ b/roles/ipareplica/tasks/install.yml @@ -5,22 +5,19 @@ - name: Install - Ensure IPA replica packages are installed package: - name: "{{ item }}" + name: "{{ ipareplica_packages }}" state: present - with_items: "{{ ipareplica_packages }}" - name: Install - Ensure IPA replica packages for dns are installed package: - name: "{{ item }}" + name: "{{ ipareplica_packages_dns }}" 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 }}" + name: "{{ ipareplica_packages_adtrust }}" state: present - with_items: "{{ ipareplica_packages_adtrust }}" when: ipareplica_setup_adtrust | bool when: ipareplica_install_packages | bool diff --git a/roles/ipareplica/tasks/uninstall.yml b/roles/ipareplica/tasks/uninstall.yml index 95dfe1969cfde2d93a87f46a94a7778a2b940569..65068e6f3b05730b239bee2b6cb591128c9fb9c1 100644 --- a/roles/ipareplica/tasks/uninstall.yml +++ b/roles/ipareplica/tasks/uninstall.yml @@ -34,8 +34,7 @@ # failed_when: False # delegate_to: "{{ groups.ipaserver[0] | default(fail) }}" -# - name: Remove IPA replica packages -# package: -# name: "{{ item }}" -# state: absent -# with_items: "{{ ipareplica_packages }}" +#- name: Remove IPA replica packages +# package: +# name: "{{ ipareplica_packages }}" +# state: absent diff --git a/roles/ipaserver/tasks/install.yml b/roles/ipaserver/tasks/install.yml index 99ce783cae341c1bdc79ce7cde5b2dddb9299427..a36ccb9f10ed21f29b7bcdac07c36484abeae163 100644 --- a/roles/ipaserver/tasks/install.yml +++ b/roles/ipaserver/tasks/install.yml @@ -4,22 +4,19 @@ - block: - name: Install - Ensure that IPA server packages are installed package: - name: "{{ item }}" + name: "{{ ipaserver_packages }}" state: present - with_items: "{{ ipaserver_packages }}" - name: Install - Ensure that IPA server packages for dns are installed package: - name: "{{ item }}" + name: "{{ ipaserver_packages_dns }}" 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 }}" + name: "{{ ipaserver_packages_adtrust }}" state: present - with_items: "{{ ipaserver_packages_adtrust }}" when: ipaserver_setup_adtrust | bool when: ipaserver_install_packages | bool diff --git a/roles/ipaserver/tasks/uninstall.yml b/roles/ipaserver/tasks/uninstall.yml index 61384f83f23800e3c83fd964198c0ebe5e0bad5c..d018429f158cab2b664bd98b00e50fe3380d9dfd 100644 --- a/roles/ipaserver/tasks/uninstall.yml +++ b/roles/ipaserver/tasks/uninstall.yml @@ -17,8 +17,7 @@ failed_when: uninstall.rc != 0 and uninstall.rc != 1 changed_when: uninstall.rc == 0 -# - name: Remove IPA server packages -# package: -# name: "{{ item }}" -# state: absent -# with_items: "{{ ipaserver_packages }}" +#- name: Remove IPA server packages +# package: +# name: "{{ ipaserver_packages }}" +# state: absent