From a306f15a741e69a4706db534149424053d878b6d Mon Sep 17 00:00:00 2001
From: Kay Yan <kay.yan@daocloud.io>
Date: Thu, 11 Jan 2024 18:23:15 +0800
Subject: [PATCH] bump vagrant 2.3.7 (#10787)
---
.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 d8cebd227..5e4b81abb 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.3.7
script:
- ./tests/scripts/vagrant-validate.sh
except: ['triggers', 'master']
diff --git a/Vagrantfile b/Vagrantfile
index 7ba30f32e..498737668 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -263,6 +263,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 4eba6a1a5..cafcfcf14 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.3.7 \
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 f12a7409a..7a0f0e08d 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.3.7
ENV VAGRANT_DEFAULT_PROVIDER=libvirt
ENV VAGRANT_ANSIBLE_TAGS=facts
--
GitLab