mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-05-07 05:43:26 +00:00
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:
@@ -1 +1 @@
|
|||||||
ansible>=2.4.1.0
|
ansible>=2.5.0
|
||||||
|
|||||||
@@ -8,8 +8,7 @@
|
|||||||
with_items: "{{ ipaclient_packages }}"
|
with_items: "{{ ipaclient_packages }}"
|
||||||
|
|
||||||
- name: Install - Include Python2/3 import test
|
- name: Install - Include Python2/3 import test
|
||||||
include: "{{role_path}}/tasks/python_2_3_test.yml"
|
import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
|
||||||
static: yes
|
|
||||||
|
|
||||||
- name: Install - Set ipaclient_servers
|
- name: Install - Set ipaclient_servers
|
||||||
set_fact:
|
set_fact:
|
||||||
@@ -76,8 +75,7 @@
|
|||||||
ipaclient_ansible_python_interpreter: "{{ ansible_python_interpreter }}"
|
ipaclient_ansible_python_interpreter: "{{ ansible_python_interpreter }}"
|
||||||
|
|
||||||
- name: Install - Include Python2/3 import test
|
- name: Install - Include Python2/3 import test
|
||||||
include: "{{role_path}}/tasks/python_2_3_test.yml"
|
import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
|
||||||
static: yes
|
|
||||||
delegate_to: "{{ ipadiscovery.servers[0] }}"
|
delegate_to: "{{ ipadiscovery.servers[0] }}"
|
||||||
|
|
||||||
- name: Install - Get One-Time Password for client enrollment
|
- name: Install - Get One-Time Password for client enrollment
|
||||||
|
|||||||
@@ -10,9 +10,9 @@
|
|||||||
- "{{ role_path }}/vars/default.yml"
|
- "{{ role_path }}/vars/default.yml"
|
||||||
|
|
||||||
- name: Install IPA client
|
- name: Install IPA client
|
||||||
include: tasks/install.yml
|
include_tasks: tasks/install.yml
|
||||||
when: state|default('present') == 'present'
|
when: state|default('present') == 'present'
|
||||||
|
|
||||||
- name: Uninstall IPA client
|
- name: Uninstall IPA client
|
||||||
include: tasks/uninstall.yml
|
include_tasks: tasks/uninstall.yml
|
||||||
when: state|default('present') == 'absent'
|
when: state|default('present') == 'absent'
|
||||||
|
|||||||
@@ -2,8 +2,7 @@
|
|||||||
# tasks to uninstall IPA client
|
# tasks to uninstall IPA client
|
||||||
|
|
||||||
#- name: Uninstall - Include Python2/3 import test
|
#- name: Uninstall - Include Python2/3 import test
|
||||||
# include: "{{role_path}}/tasks/python_2_3_test.yml"
|
# import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
|
||||||
# static: yes
|
|
||||||
|
|
||||||
- name: Uninstall - Uninstall IPA client
|
- name: Uninstall - Uninstall IPA client
|
||||||
command: >
|
command: >
|
||||||
|
|||||||
@@ -23,8 +23,7 @@
|
|||||||
when: not ipareplica_no_package_install | bool and ipareplica_setup_adtrust | bool
|
when: not ipareplica_no_package_install | bool and ipareplica_setup_adtrust | bool
|
||||||
|
|
||||||
- name: Install - Include Python2/3 import test
|
- name: Install - Include Python2/3 import test
|
||||||
include: "{{role_path}}/tasks/python_2_3_test.yml"
|
inport_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
|
||||||
static: yes
|
|
||||||
|
|
||||||
- name: Install - Set default principal if no keytab is given
|
- name: Install - Set default principal if no keytab is given
|
||||||
set_fact:
|
set_fact:
|
||||||
|
|||||||
@@ -10,9 +10,9 @@
|
|||||||
- "vars/default.yml"
|
- "vars/default.yml"
|
||||||
|
|
||||||
- name: Install IPA replica
|
- name: Install IPA replica
|
||||||
include: tasks/install.yml
|
include_tasks: tasks/install.yml
|
||||||
when: state|default('present') == 'present'
|
when: state|default('present') == 'present'
|
||||||
|
|
||||||
- name: Uninstall IPA replica
|
- name: Uninstall IPA replica
|
||||||
include: tasks/uninstall.yml
|
include_tasks: tasks/uninstall.yml
|
||||||
when: state|default('present') == 'absent'
|
when: state|default('present') == 'absent'
|
||||||
|
|||||||
@@ -2,8 +2,7 @@
|
|||||||
# tasks to uninstall IPA replica
|
# tasks to uninstall IPA replica
|
||||||
|
|
||||||
#- name: Uninstall - Include Python2/3 import test
|
#- name: Uninstall - Include Python2/3 import test
|
||||||
# include: "{{role_path}}/tasks/python_2_3_test.yml"
|
# import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
|
||||||
# static: yes
|
|
||||||
|
|
||||||
- name: Uninstall - Uninstall IPA replica
|
- name: Uninstall - Uninstall IPA replica
|
||||||
command: >
|
command: >
|
||||||
|
|||||||
@@ -22,8 +22,7 @@
|
|||||||
when: ipaserver_setup_adtrust | bool
|
when: ipaserver_setup_adtrust | bool
|
||||||
|
|
||||||
- name: Install - Include Python2/3 import test
|
- name: Install - Include Python2/3 import test
|
||||||
include: "{{role_path}}/tasks/python_2_3_test.yml"
|
import_tasks: "{{role_path}}/tasks/python_2_3_test.yml"
|
||||||
static: yes
|
|
||||||
|
|
||||||
- name: Install - Server installation test
|
- name: Install - Server installation test
|
||||||
ipaserver_test:
|
ipaserver_test:
|
||||||
|
|||||||
@@ -10,9 +10,9 @@
|
|||||||
- "vars/default.yml"
|
- "vars/default.yml"
|
||||||
|
|
||||||
- name: Install IPA server
|
- name: Install IPA server
|
||||||
include: tasks/install.yml
|
include_tasks: tasks/install.yml
|
||||||
when: state|default('present') == 'present'
|
when: state|default('present') == 'present'
|
||||||
|
|
||||||
- name: Uninstall IPA server
|
- name: Uninstall IPA server
|
||||||
include: tasks/uninstall.yml
|
include_tasks: tasks/uninstall.yml
|
||||||
when: state|default('present') == 'absent'
|
when: state|default('present') == 'absent'
|
||||||
|
|||||||
@@ -2,8 +2,7 @@
|
|||||||
# tasks to uninstall IPA server
|
# tasks to uninstall IPA server
|
||||||
|
|
||||||
#- name: Uninstall - Include Python2/3 import test
|
#- name: Uninstall - Include Python2/3 import test
|
||||||
# include: "{{role_path}}/tasks/python_2_3_test.yml"
|
# import: "{{role_path}}/tasks/python_2_3_test.yml"
|
||||||
# static: yes
|
|
||||||
|
|
||||||
- name: Uninstall - Uninstall IPA server
|
- name: Uninstall - Uninstall IPA server
|
||||||
command: >
|
command: >
|
||||||
|
|||||||
Reference in New Issue
Block a user