ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: revert vagrant_variable file name detection 

This commit reverts the following change:

fcf181342a (diff-23b6f443c01ea2efcb4f36eedfea9089R7-R14)

this is causing CI failures so this commit is intended to unlock the CI.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 5353ab8a23)
pull/4776/head
Guillaume Abrioux 2019-11-25 10:03:08 +01:00
parent 4edef59feb
commit 1d055c0c0f
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Vagrantfile vendored
View File

@ -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)