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

Vagrantfile improvements #150

Merged
merged 3 commits into from Nov 4, 2015
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Use file-relative paths to allow usage from subdirs

  • Loading branch information
aneeshusa committed Nov 4, 2015
commit a6aacf2a567cc46789d33ac89d8ced5a51d04069
@@ -13,7 +13,12 @@ Vagrant.configure(2) do |config|
config.cache.scope = :machine
end

YAML.load_file('.travis.yml')['matrix']['include'].map do |node|
dir = File.dirname(__FILE__)
minion_config = YAML.load_file(File.join(dir, '.travis/minion'))
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|
node_config = case node['os']
when 'linux'
case node['dist']
@@ -31,8 +36,8 @@ Vagrant.configure(2) do |config|
end.compact.each do |node|
config.vm.define node[:id] do |machine|
machine.vm.box = node[:box]
machine.vm.synced_folder ".", "/srv/salt/states"
machine.vm.synced_folder ".travis/test_pillars", "/srv/salt/pillars"
machine.vm.synced_folder dir, state_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'
salt.install_command = node[:os] # Pass OS type to install_salt script
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.