From 5353ab8a23aee92ebab8146eeeeffcfcb25c0865 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 25 Nov 2019 10:03:08 +0100 Subject: [PATCH] tests: revert vagrant_variable file name detection This commit reverts the following change: https://github.com/ceph/ceph-ansible/pull/4510/commits/fcf181342a70b78a355d1c985699028012326b5f#diff-23b6f443c01ea2efcb4f36eedfea9089R7-R14 this is causing CI failures so this commit is intended to unlock the CI. Signed-off-by: Guillaume Abrioux --- Vagrantfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 592e14dfd..9493a3873 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -4,13 +4,7 @@ require 'yaml' VAGRANTFILE_API_VERSION = '2' -if File.file?('vagrant_variables.yml') then - vagrant_variable_filename='vagrant_variables.yml' -else - vagrant_variable_filename='vagrant_variables.yml.sample' -end - -config_file=File.expand_path(File.join(File.dirname(__FILE__), vagrant_variable_filename)) +config_file=File.expand_path(File.join(File.dirname(__FILE__), 'vagrant_variables.yml')) settings=YAML.load_file(config_file) -- 2.39.5