From 579550d32d0d60e621cc12c85d5c0694580ef211 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 15 Feb 2018 10:27:29 +0000 Subject: [PATCH] tasks: Replace deprecated 'include' statements Ansible 2.4+ complains that 'include' statements are deprecated in favor of 'import_tasks' and 'include_tasks' so replace all of them. Change-Id: Ib65187c1239482bfd823b2f3dfd437aa7a709ccd --- tasks/galera_install.yml | 2 +- tasks/galera_post_install.yml | 2 +- tasks/galera_ssl.yml | 2 +- tasks/galera_upgrade.yml | 2 +- tasks/main.yml | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tasks/galera_install.yml b/tasks/galera_install.yml index 26e9c870..1d110fb8 100644 --- a/tasks/galera_install.yml +++ b/tasks/galera_install.yml @@ -83,7 +83,7 @@ - galera_xtrabackup_compression | bool - ansible_architecture != 'x86_64' -- include: "galera_install_{{ ansible_pkg_mgr }}.yml" +- include_tasks: "galera_install_{{ ansible_pkg_mgr }}.yml" - name: Install pip packages pip: diff --git a/tasks/galera_post_install.yml b/tasks/galera_post_install.yml index e22c9a44..0cb940bb 100644 --- a/tasks/galera_post_install.yml +++ b/tasks/galera_post_install.yml @@ -99,7 +99,7 @@ when: - log_dir.rc == 1 -- include: galera_ssl.yml +- include_tasks: galera_ssl.yml when: - galera_use_ssl | bool diff --git a/tasks/galera_ssl.yml b/tasks/galera_ssl.yml index f568c290..a424c96a 100644 --- a/tasks/galera_ssl.yml +++ b/tasks/galera_ssl.yml @@ -21,7 +21,7 @@ group: "mysql" mode: "0750" -- include: galera_ssl_self_signed.yml +- include_tasks: galera_ssl_self_signed.yml static: no when: - not galera_user_ssl_cert is defined diff --git a/tasks/galera_upgrade.yml b/tasks/galera_upgrade.yml index e409e32d..357866d6 100644 --- a/tasks/galera_upgrade.yml +++ b/tasks/galera_upgrade.yml @@ -37,7 +37,7 @@ tags: - galera_server-upgrade -- include: galera_upgrade_pre.yml +- include_tasks: galera_upgrade_pre.yml static: no when: - galera_upgrade | bool diff --git a/tasks/main.yml b/tasks/main.yml index 94bcbb2d..f4ec05ac 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -75,28 +75,28 @@ tags: - always -- include: galera_cluster_state.yml +- include_tasks: galera_cluster_state.yml when: - galera_deployed | bool - not galera_ignore_cluster_state | bool tags: - always -- include: galera_upgrade.yml +- include_tasks: galera_upgrade.yml tags: - galera_server-upgrade -- include: galera_install.yml +- include_tasks: galera_install.yml tags: - galera_server-install -- include: galera_post_install.yml +- include_tasks: galera_post_install.yml tags: - galera_server-config - name: Flush handlers meta: flush_handlers -- include: galera_setup.yml +- include_tasks: galera_setup.yml tags: - galera_server-config