From 6dc58c55f26e1c14490152cda7a76b0f4de099a8 Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Fri, 5 Jan 2024 09:35:31 +0100
Subject: [PATCH] Bump vagrant version

Otherwise we get spurious dependencies errors when installing libvirt
plugin
Set the vagrant ansible compatibility mode explicitely otherwise vagrant
use incorrect ansible flags (version detection fails somehow...)
---
 .gitlab-ci/lint.yml                  | 2 +-
 Vagrantfile                          | 1 +
 pipeline.Dockerfile                  | 2 +-
 test-infra/vagrant-docker/Dockerfile | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci/lint.yml b/.gitlab-ci/lint.yml
index f8228672c63..d77ad595af7 100644
--- a/.gitlab-ci/lint.yml
+++ b/.gitlab-ci/lint.yml
@@ -14,7 +14,7 @@ vagrant-validate:
   stage: unit-tests
   tags: [light]
   variables:
-    VAGRANT_VERSION: 2.3.4
+    VAGRANT_VERSION: 2.4.0
   script:
     - ./tests/scripts/vagrant-validate.sh
   except: ['triggers', 'master']
diff --git a/Vagrantfile b/Vagrantfile
index 7ba30f32e57..bbe1a49c715 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -262,6 +262,7 @@ Vagrant.configure("2") do |config|
       # And limit the action to gathering facts, the full playbook is going to be ran by testcases_run.sh
       if i == $num_instances
         node.vm.provision "ansible" do |ansible|
+          ansible.compatibility_mode = "2.0"
           ansible.playbook = $playbook
           ansible.verbose = $ansible_verbosity
           $ansible_inventory_path = File.join( $inventory, "hosts.ini")
diff --git a/pipeline.Dockerfile b/pipeline.Dockerfile
index eb4dcf6d630..f639ac5da55 100644
--- a/pipeline.Dockerfile
+++ b/pipeline.Dockerfile
@@ -4,7 +4,7 @@ FROM ubuntu:jammy-20230308
 # Pip needs this as well at the moment to install ansible
 # (and potentially other packages)
 # See: https://github.com/pypa/pip/issues/10219
-ENV VAGRANT_VERSION=2.3.4 \
+ENV VAGRANT_VERSION=2.4.0 \
     VAGRANT_DEFAULT_PROVIDER=libvirt \
     VAGRANT_ANSIBLE_TAGS=facts \
     LANG=C.UTF-8 \
diff --git a/test-infra/vagrant-docker/Dockerfile b/test-infra/vagrant-docker/Dockerfile
index f12a7409ae8..67b69040af7 100644
--- a/test-infra/vagrant-docker/Dockerfile
+++ b/test-infra/vagrant-docker/Dockerfile
@@ -3,7 +3,7 @@
 ARG KUBESPRAY_VERSION
 FROM quay.io/kubespray/kubespray:${KUBESPRAY_VERSION}
 
-ENV VAGRANT_VERSION=2.3.4
+ENV VAGRANT_VERSION=2.4.0
 ENV VAGRANT_DEFAULT_PROVIDER=libvirt
 ENV VAGRANT_ANSIBLE_TAGS=facts