From d241d5d39a73d0f2a61400b45732497e61fd12f3 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Mon, 2 Mar 2026 00:06:48 -0500 Subject: [PATCH] Replace include: with include_tasks: The include: method was deprecated with Ansible Core 2.19; replace it with include_tasks. --- roles/pvc/tasks/autobackup/main.yml | 4 ++-- roles/pvc/tasks/automirror/main.yml | 4 ++-- roles/pvc/tasks/ceph/main.yml | 2 +- roles/pvc/tasks/cputuning/main.yml | 4 ++-- roles/pvc/tasks/libvirt/main.yml | 2 +- roles/pvc/tasks/main.yml | 24 ++++++++++++------------ roles/pvc/tasks/patroni/main.yml | 2 +- roles/pvc/tasks/pvc/main.yml | 2 +- roles/pvc/tasks/zookeeper/main.yml | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/roles/pvc/tasks/autobackup/main.yml b/roles/pvc/tasks/autobackup/main.yml index 8be6902..3ccd380 100644 --- a/roles/pvc/tasks/autobackup/main.yml +++ b/roles/pvc/tasks/autobackup/main.yml @@ -1,7 +1,7 @@ --- -- include: enable.yml +- include_tasks: enable.yml when: pvc_autobackup.enabled -- include: disable.yml +- include_tasks: disable.yml when: not pvc_autobackup.enabled diff --git a/roles/pvc/tasks/automirror/main.yml b/roles/pvc/tasks/automirror/main.yml index 9b06d1b..5e4ad2c 100644 --- a/roles/pvc/tasks/automirror/main.yml +++ b/roles/pvc/tasks/automirror/main.yml @@ -1,7 +1,7 @@ --- -- include: enable.yml +- include_tasks: enable.yml when: pvc_automirror.enabled -- include: disable.yml +- include_tasks: disable.yml when: not pvc_automirror.enabled diff --git a/roles/pvc/tasks/ceph/main.yml b/roles/pvc/tasks/ceph/main.yml index ea1a3ab..bfc5705 100644 --- a/roles/pvc/tasks/ceph/main.yml +++ b/roles/pvc/tasks/ceph/main.yml @@ -43,7 +43,7 @@ dest: /etc/ceph state: directory -- include: ceph/bootstrap.yml +- include_tasks: ceph/bootstrap.yml when: do_bootstrap is defined and do_bootstrap run_once: yes diff --git a/roles/pvc/tasks/cputuning/main.yml b/roles/pvc/tasks/cputuning/main.yml index 38106a1..3b9957f 100644 --- a/roles/pvc/tasks/cputuning/main.yml +++ b/roles/pvc/tasks/cputuning/main.yml @@ -1,7 +1,7 @@ --- -- include: enable.yml +- include_tasks: enable.yml when: cpu_tuning.enabled -- include: disable.yml +- include_tasks: disable.yml when: not cpu_tuning.enabled diff --git a/roles/pvc/tasks/libvirt/main.yml b/roles/pvc/tasks/libvirt/main.yml index 8894f15..f19cab5 100644 --- a/roles/pvc/tasks/libvirt/main.yml +++ b/roles/pvc/tasks/libvirt/main.yml @@ -47,7 +47,7 @@ - ceph-secret.xml notify: restart libvirtd -- include: libvirt/bootstrap.yml +- include_tasks: libvirt/bootstrap.yml when: do_bootstrap is defined and do_bootstrap run_once: yes diff --git a/roles/pvc/tasks/main.yml b/roles/pvc/tasks/main.yml index db956cc..9ee6a20 100644 --- a/roles/pvc/tasks/main.yml +++ b/roles/pvc/tasks/main.yml @@ -24,54 +24,54 @@ when: newhost_check.changed tags: always -- include: common/add_cluster_ips.yml +- include_tasks: common/add_cluster_ips.yml when: newhost is defined and newhost tags: always # Install system tweaks -- include: system/main.yml +- include_tasks: system/main.yml tags: pvc-system # Install base databases (coordinators only) -- include: ceph/main.yml +- include_tasks: ceph/main.yml tags: pvc-ceph when: is_coordinator -- include: zookeeper/main.yml +- include_tasks: zookeeper/main.yml tags: pvc-zookeeper when: is_coordinator -- include: patroni/main.yml +- include_tasks: patroni/main.yml tags: pvc-patroni when: is_coordinator -- include: keydb/main.yml +- include_tasks: keydb/main.yml tags: pvc-keydb when: is_coordinator # Install core services -- include: libvirt/main.yml +- include_tasks: libvirt/main.yml tags: pvc-libvirt -- include: frr/main.yml +- include_tasks: frr/main.yml tags: pvc-frr # Install PVC daemon -- include: pvc/main.yml +- include_tasks: pvc/main.yml tags: pvc-daemon # Install PVC autobackup -- include: autobackup/main.yml +- include_tasks: autobackup/main.yml tags: pvc-autobackup when: pvc_autobackup is defined # Install PVC automirror -- include: automirror/main.yml +- include_tasks: automirror/main.yml tags: pvc-automirror when: pvc_automirror is defined # Install CPU tuning -- include: cputuning/main.yml +- include_tasks: cputuning/main.yml tags: pvc-cputuning when: debian_version|int >= 11 and cpu_tuning is defined diff --git a/roles/pvc/tasks/patroni/main.yml b/roles/pvc/tasks/patroni/main.yml index 1abcb03..4042adb 100644 --- a/roles/pvc/tasks/patroni/main.yml +++ b/roles/pvc/tasks/patroni/main.yml @@ -118,7 +118,7 @@ with_items: - { src: "patroni/powerdns-schema.sql", dest: "/etc/postgresql/powerdns-schema.sql" } -- include: patroni/bootstrap.yml +- include_tasks: patroni/bootstrap.yml run_once: yes when: do_bootstrap is defined and do_bootstrap diff --git a/roles/pvc/tasks/pvc/main.yml b/roles/pvc/tasks/pvc/main.yml index 5c5f093..606869c 100644 --- a/roles/pvc/tasks/pvc/main.yml +++ b/roles/pvc/tasks/pvc/main.yml @@ -71,7 +71,7 @@ dest: /usr/lib/check_mk_agent/plugins/pvc_status mode: 0755 -- include: pvc/bootstrap.yml +- include_tasks: pvc/bootstrap.yml run_once: yes when: do_bootstrap is defined and do_bootstrap and is_coordinator diff --git a/roles/pvc/tasks/zookeeper/main.yml b/roles/pvc/tasks/zookeeper/main.yml index 69d3d6d..2516536 100644 --- a/roles/pvc/tasks/zookeeper/main.yml +++ b/roles/pvc/tasks/zookeeper/main.yml @@ -72,7 +72,7 @@ with_items: - zookeeper -- include: zookeeper/bootstrap.yml +- include_tasks: zookeeper/bootstrap.yml when: do_bootstrap is defined and do_bootstrap - meta: flush_handlers