From b92281fe709fb01e49950f14ab3c23fd5bd47c38 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Sun, 7 Apr 2019 22:51:14 +0200
Subject: [PATCH] Simplify test include. (#54962)

---
 .../targets/inventory_docker_swarm/playbooks/swarm_setup.yml    | 2 +-
 test/integration/targets/inventory_docker_swarm/runme.sh        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml b/test/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml
index b171415bca2..2d026a233a0 100644
--- a/test/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml
+++ b/test/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml
@@ -4,7 +4,7 @@
   tasks:
     - name: Setup docker
       include_role:
-        name: ../../setup_docker
+        name: setup_docker
     - name: Create a Swarm cluster
       docker_swarm:
         state: present
diff --git a/test/integration/targets/inventory_docker_swarm/runme.sh b/test/integration/targets/inventory_docker_swarm/runme.sh
index 53e1760b054..e2ba6869e83 100755
--- a/test/integration/targets/inventory_docker_swarm/runme.sh
+++ b/test/integration/targets/inventory_docker_swarm/runme.sh
@@ -14,7 +14,7 @@ cleanup() {
 trap cleanup INT TERM EXIT
 
 echo "Setup"
-ansible-playbook playbooks/swarm_setup.yml
+ANSIBLE_ROLES_PATH=.. ansible-playbook  playbooks/swarm_setup.yml
 
 echo "Test docker_swarm inventory 1"
 ansible-playbook -i inventory_1.docker_swarm.yml playbooks/test_inventory_1.yml