Simplify test include. (ansible#54962)

pva · Apr 7, 2019 · b92281f · b92281f
1 parent 993727f
commit b92281f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -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