Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Vagrantfile after #374 #394

Merged
merged 3 commits into from Jul 12, 2016
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev

Handle paths more portably in Vagrantfile

  • Loading branch information
aneeshusa committed Jul 12, 2016
commit 1a1eeb24dd7c2563279ae3ca2983f40d716b384f
@@ -16,11 +16,12 @@ Vagrant.configure(2) do |config|
end

dir = File.dirname(__FILE__)
minion_config = YAML.load_file(File.join(dir, '.travis/minion'))
minion_config_path = File.join(dir, '.travis', 'minion')
minion_config = YAML.load_file(minion_config_path)
state_root = minion_config['file_roots']['base'][0]
pillar_root = minion_config['pillar_roots']['base'][0]

YAML.load_file(File.join(dir,'.travis.yml'))['matrix']['include'].map do |node|
YAML.load_file(File.join(dir, '.travis.yml'))['matrix']['include'].map do |node|
node_config = case node['os']
when 'linux'
case node['dist']
@@ -46,12 +47,12 @@ Vagrant.configure(2) do |config|
vbox.linked_clone = true
end
machine.vm.synced_folder dir, state_root
machine.vm.synced_folder File.join(dir, ".travis/test_pillars"), pillar_root
machine.vm.synced_folder File.join(dir, '.travis', 'test_pillars'), pillar_root
machine.vm.provision :salt do |salt|
salt.bootstrap_script = '.travis/install_salt.sh'
salt.bootstrap_script = File.join(dir, '.travis', 'install_salt.sh')
salt.install_args = node[:os] # Pass OS type to bootstrap script
salt.masterless = true
salt.minion_config = '.travis/minion'
salt.minion_config = minion_config_path
# hack to provide additional options to salt-call
salt.minion_id = node[:id] + ' --retcode-passthrough'
salt.run_highstate = true
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.