From 0af6dfca5dc59d57818fb132d969f82317a2e257 Mon Sep 17 00:00:00 2001
From: Kay Yan <kay.yan@daocloud.io>
Date: Thu, 11 Jan 2024 22:57:54 +0800
Subject: [PATCH] bump vagrant 2.3.7 (#10790)

---
 .gitlab-ci/lint.yml                  | 2 +-
 Vagrantfile                          | 1 +
 pipeline.Dockerfile                  | 8 ++++----
 test-infra/vagrant-docker/Dockerfile | 2 +-
 tests/scripts/vagrant-validate.sh    | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci/lint.yml b/.gitlab-ci/lint.yml
index c9e1bdea4..5649f096e 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.2.19
+    VAGRANT_VERSION: 2.3.7
   script:
     - ./tests/scripts/vagrant-validate.sh
   except: ['triggers', 'master']
diff --git a/Vagrantfile b/Vagrantfile
index 9eb5c3b5d..4460abaa4 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -257,6 +257,7 @@ Vagrant.configure("2") do |config|
       if i == $num_instances
         node.vm.provision "ansible" do |ansible|
           ansible.playbook = $playbook
+          ansible.compatibility_mode = "2.0"
           ansible.verbose = $ansible_verbosity
           $ansible_inventory_path = File.join( $inventory, "hosts.ini")
           if File.exist?($ansible_inventory_path)
diff --git a/pipeline.Dockerfile b/pipeline.Dockerfile
index c25c24244..92ba87722 100644
--- a/pipeline.Dockerfile
+++ b/pipeline.Dockerfile
@@ -5,7 +5,7 @@ ARG ARCH=amd64
 ARG TZ=Etc/UTC
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-ENV VAGRANT_VERSION=2.2.19
+ENV VAGRANT_VERSION=2.3.7
 ENV VAGRANT_DEFAULT_PROVIDER=libvirt
 ENV VAGRANT_ANSIBLE_TAGS=facts
 
@@ -41,9 +41,9 @@ RUN KUBE_VERSION=$(sed -n 's/^kube_version: //p' roles/kubespray-defaults/defaul
     && mv kubectl /usr/local/bin/kubectl
 
 # Install Vagrant
-RUN wget https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_x86_64.deb && \
- dpkg -i vagrant_${VAGRANT_VERSION}_x86_64.deb && \
- rm vagrant_${VAGRANT_VERSION}_x86_64.deb && \
+RUN wget https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}-1_amd64.deb && \
+ dpkg -i vagrant_${VAGRANT_VERSION}-1_amd64.deb && \
+ rm vagrant_${VAGRANT_VERSION}-1_amd64.deb && \
  vagrant plugin install vagrant-libvirt
 
 # Install Kubernetes collections
diff --git a/test-infra/vagrant-docker/Dockerfile b/test-infra/vagrant-docker/Dockerfile
index f8c05e743..29c9ee1f2 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.2.19
+ENV VAGRANT_VERSION=2.3.7
 ENV VAGRANT_DEFAULT_PROVIDER=libvirt
 ENV VAGRANT_ANSIBLE_TAGS=facts
 
diff --git a/tests/scripts/vagrant-validate.sh b/tests/scripts/vagrant-validate.sh
index 337782e82..0b05457df 100755
--- a/tests/scripts/vagrant-validate.sh
+++ b/tests/scripts/vagrant-validate.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -euxo pipefail
 
-curl -sL "https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}_x86_64.deb" -o "/tmp/vagrant_${VAGRANT_VERSION}_x86_64.deb"
-dpkg -i "/tmp/vagrant_${VAGRANT_VERSION}_x86_64.deb"
+curl -sL "https://releases.hashicorp.com/vagrant/${VAGRANT_VERSION}/vagrant_${VAGRANT_VERSION}-1_amd64.deb" -o "/tmp/vagrant_${VAGRANT_VERSION}-1_amd64.deb"
+dpkg -i "/tmp/vagrant_${VAGRANT_VERSION}-1_amd64.deb"
 vagrant validate --ignore-provider