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
This commit is contained in:
Thomas Woerner
2018-11-22 16:23:29 +01:00
parent 6910d99fc9
commit 20d25d0d43
10 changed files with 14 additions and 21 deletions

View File

@@ -1 +1 @@
ansible>=2.4.1.0
ansible>=2.5.0

View File

@@ -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

View File

@@ -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'

View File

@@ -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: >

View File

@@ -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:

View File

@@ -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'

View File

@@ -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: >

View File

@@ -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:

View File

@@ -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'

View File

@@ -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: >