From 20d25d0d4343fab78ddd6b35bcfa24ffce8e4c48 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Thu, 22 Nov 2018 16:23:29 +0100
Subject: [PATCH] Replace deprecated include with import_tasks and
include_tasks
As the old way to include tasks is deprecated, replace static include
statements with import_tasks and dynamic ones with include_tasks.
Increaded the required ansible version to 2.5.0 to make sure that
include_tasks and import_tasks is working as expected.
Fixes issue #38
---
requirements.txt | 2 +-
roles/ipaclient/tasks/install.yml | 6 ++----
roles/ipaclient/tasks/main.yml | 4 ++--
roles/ipaclient/tasks/uninstall.yml | 3 +--
roles/ipareplica/tasks/install.yml | 3 +--
roles/ipareplica/tasks/main.yml | 4 ++--
roles/ipareplica/tasks/uninstall.yml | 3 +--
roles/ipaserver/tasks/install.yml | 3 +--
roles/ipaserver/tasks/main.yml | 4 ++--
roles/ipaserver/tasks/uninstall.yml | 3 +--
10 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 9d8b5083..597ee48c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-ansible>=2.4.1.0
+ansible>=2.5.0
diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml
index 62d9365b..24493633 100644
--- a/roles/ipaclient/tasks/install.yml
+++ b/roles/ipaclient/tasks/install.yml
@@ -8,8 +8,7 @@
with_items: "{{ ipaclient_packages }}"
- name: Install - Include Python2/3 import test
- include: "{{role_path}}/tasks/python_2_3_test.yml"
- static: yes
+ import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
- name: Install - Set ipaclient_servers
set_fact:
@@ -76,8 +75,7 @@
ipaclient_ansible_python_interpreter: "{{ ansible_python_interpreter }}"
- name: Install - Include Python2/3 import test
- include: "{{role_path}}/tasks/python_2_3_test.yml"
- static: yes
+ import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
delegate_to: "{{ ipadiscovery.servers[0] }}"
- name: Install - Get One-Time Password for client enrollment
diff --git a/roles/ipaclient/tasks/main.yml b/roles/ipaclient/tasks/main.yml
index 4682e7cc..541bd0ca 100644
--- a/roles/ipaclient/tasks/main.yml
+++ b/roles/ipaclient/tasks/main.yml
@@ -10,9 +10,9 @@
- "{{ role_path }}/vars/default.yml"
- name: Install IPA client
- include: tasks/install.yml
+ include_tasks: tasks/install.yml
when: state|default('present') == 'present'
- name: Uninstall IPA client
- include: tasks/uninstall.yml
+ include_tasks: tasks/uninstall.yml
when: state|default('present') == 'absent'
diff --git a/roles/ipaclient/tasks/uninstall.yml b/roles/ipaclient/tasks/uninstall.yml
index 39deda53..6f0f570b 100644
--- a/roles/ipaclient/tasks/uninstall.yml
+++ b/roles/ipaclient/tasks/uninstall.yml
@@ -2,8 +2,7 @@
# tasks to uninstall IPA client
#- name: Uninstall - Include Python2/3 import test
-# include: "{{role_path}}/tasks/python_2_3_test.yml"
-# static: yes
+# import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
- name: Uninstall - Uninstall IPA client
command: >
diff --git a/roles/ipareplica/tasks/install.yml b/roles/ipareplica/tasks/install.yml
index 30653d96..7472964b 100644
--- a/roles/ipareplica/tasks/install.yml
+++ b/roles/ipareplica/tasks/install.yml
@@ -23,8 +23,7 @@
when: not ipareplica_no_package_install | bool and ipareplica_setup_adtrust | bool
- name: Install - Include Python2/3 import test
- include: "{{role_path}}/tasks/python_2_3_test.yml"
- static: yes
+ inport_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
- name: Install - Set default principal if no keytab is given
set_fact:
diff --git a/roles/ipareplica/tasks/main.yml b/roles/ipareplica/tasks/main.yml
index 59f337b4..2cdc6dd4 100644
--- a/roles/ipareplica/tasks/main.yml
+++ b/roles/ipareplica/tasks/main.yml
@@ -10,9 +10,9 @@
- "vars/default.yml"
- name: Install IPA replica
- include: tasks/install.yml
+ include_tasks: tasks/install.yml
when: state|default('present') == 'present'
- name: Uninstall IPA replica
- include: tasks/uninstall.yml
+ include_tasks: tasks/uninstall.yml
when: state|default('present') == 'absent'
diff --git a/roles/ipareplica/tasks/uninstall.yml b/roles/ipareplica/tasks/uninstall.yml
index 98269f07..b5262ea3 100644
--- a/roles/ipareplica/tasks/uninstall.yml
+++ b/roles/ipareplica/tasks/uninstall.yml
@@ -2,8 +2,7 @@
# tasks to uninstall IPA replica
#- name: Uninstall - Include Python2/3 import test
-# include: "{{role_path}}/tasks/python_2_3_test.yml"
-# static: yes
+# import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
- name: Uninstall - Uninstall IPA replica
command: >
diff --git a/roles/ipaserver/tasks/install.yml b/roles/ipaserver/tasks/install.yml
index c995b4f8..e42ee03c 100644
--- a/roles/ipaserver/tasks/install.yml
+++ b/roles/ipaserver/tasks/install.yml
@@ -22,8 +22,7 @@
when: ipaserver_setup_adtrust | bool
- name: Install - Include Python2/3 import test
- include: "{{role_path}}/tasks/python_2_3_test.yml"
- static: yes
+ import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
- name: Install - Server installation test
ipaserver_test:
diff --git a/roles/ipaserver/tasks/main.yml b/roles/ipaserver/tasks/main.yml
index e2790be2..a71df743 100644
--- a/roles/ipaserver/tasks/main.yml
+++ b/roles/ipaserver/tasks/main.yml
@@ -10,9 +10,9 @@
- "vars/default.yml"
- name: Install IPA server
- include: tasks/install.yml
+ include_tasks: tasks/install.yml
when: state|default('present') == 'present'
- name: Uninstall IPA server
- include: tasks/uninstall.yml
+ include_tasks: tasks/uninstall.yml
when: state|default('present') == 'absent'
diff --git a/roles/ipaserver/tasks/uninstall.yml b/roles/ipaserver/tasks/uninstall.yml
index 373585c5..78044e07 100644
--- a/roles/ipaserver/tasks/uninstall.yml
+++ b/roles/ipaserver/tasks/uninstall.yml
@@ -2,8 +2,7 @@
# tasks to uninstall IPA server
#- name: Uninstall - Include Python2/3 import test
-# include: "{{role_path}}/tasks/python_2_3_test.yml"
-# static: yes
+# import: "{{role_path}}/tasks/python_2_3_test.yml"
- name: Uninstall - Uninstall IPA server
command: >
--
GitLab