From a1e6229171d9badf683b9bfa0eb1dd7a03557b41 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Mon, 23 May 2022 14:08:23 -0700
Subject: [PATCH] Remove "include:" usage from multi-node-bridge

This is deprecated, and include_tasks is sufficient and present
in all supported versions.

Change-Id: If88d9d6ce9fb40a9a8e42e7a32d473ffd51b780a
---
 roles/multi-node-bridge/tasks/main.yaml | 26 ++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/roles/multi-node-bridge/tasks/main.yaml b/roles/multi-node-bridge/tasks/main.yaml
index 3fe15bda7..27abc1968 100644
--- a/roles/multi-node-bridge/tasks/main.yaml
+++ b/roles/multi-node-bridge/tasks/main.yaml
@@ -1,24 +1,28 @@
 # Note (dmsimard)
 # We explicitely declare a PATH environment variable because '/sbin' is not in
 # PATH when using 'become: yes' on some distributions
-- include: common.yaml
-  environment:
-    PATH: "{{ ansible_env.PATH }}:/sbin:/usr/sbin"
+- include_tasks:
+    file: common.yaml
+    apply:
+      environment:
+        PATH: "{{ ansible_env.PATH }}:/sbin:/usr/sbin"
   when: >-
     inventory_hostname in groups['switch'] or
     inventory_hostname in groups['peers']
 
-- include: switch.yaml
-  environment:
-    PATH: "{{ ansible_env.PATH }}:/sbin:/usr/sbin"
+- include_tasks:
+    file: switch.yaml
+    apply:
+      environment:
+        PATH: "{{ ansible_env.PATH }}:/sbin:/usr/sbin"
   when: inventory_hostname in groups['switch']
-  static: no
 
-- include: peer.yaml
-  environment:
-    PATH: "{{ ansible_env.PATH }}:/sbin:/usr/sbin"
+- include_tasks:
+    file: peer.yaml
+    apply:
+      environment:
+        PATH: "{{ ansible_env.PATH }}:/sbin:/usr/sbin"
   when: inventory_hostname in groups['peers']
-  static: no
 
 - name: Persist iptables rules
   include_role: