]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tests: revert vagrant_variable file name detection
authorGuillaume Abrioux <gabrioux@redhat.com>
Mon, 25 Nov 2019 09:03:08 +0000 (10:03 +0100)
committerGuillaume Abrioux <gabrioux@redhat.com>
Mon, 25 Nov 2019 14:33:10 +0000 (15:33 +0100)
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 <gabrioux@redhat.com>
(cherry picked from commit 5353ab8a23aee92ebab8146eeeeffcfcb25c0865)

Vagrantfile

index ac4ca8aef4fe98495cf9c06bcfea07179c8639c0..01788ebdfcc65be5f5f98a8f2adffc6b80e730db 100644 (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)