testing
This commit is contained in:
parent
9b5be29a1a
commit
73b59da626
14
Vagrantfile
vendored
14
Vagrantfile
vendored
@ -16,13 +16,9 @@ SSH_FORWARD = settings['SSH_FORWARD'] || false
|
|||||||
|
|
||||||
# Default to shell environment variable: PLAYBOOK (priority #1)
|
# Default to shell environment variable: PLAYBOOK (priority #1)
|
||||||
PLAYBOOK=ENV["PLAYBOOK"]
|
PLAYBOOK=ENV["PLAYBOOK"]
|
||||||
if !PLAYBOOK
|
if !PLAYBOOK || PLAYBOOK.empty?
|
||||||
# PLAYBOOK setting in .vagrant.yml (priority #2)
|
# PLAYBOOK setting in .vagrant.yml (priority #2)
|
||||||
PLAYBOOK = settings['PLAYBOOK'] || false
|
PLAYBOOK = settings['PLAYBOOK'] || false
|
||||||
if !PLAYBOOK || PLAYBOOK.empty?
|
|
||||||
puts "[VAGRANTFILE ERROR]: Set PLAYBOOK setting in .vagrant.yml"
|
|
||||||
abort
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
Vagrant.configure("2") do |config|
|
Vagrant.configure("2") do |config|
|
||||||
@ -31,10 +27,10 @@ Vagrant.configure("2") do |config|
|
|||||||
config.ssh.forward_agent = SSH_FORWARD
|
config.ssh.forward_agent = SSH_FORWARD
|
||||||
|
|
||||||
# Libvrit provider
|
# Libvrit provider
|
||||||
config.vm.provider :libvirt do |libvirt|
|
#config.vm.provider :libvirt do |libvirt|
|
||||||
libvirt.cpus = VAGRANT_CPUS
|
# libvirt.cpus = VAGRANT_CPUS
|
||||||
libvirt.memory = VAGRANT_MEM
|
# libvirt.memory = VAGRANT_MEM
|
||||||
end
|
#end
|
||||||
|
|
||||||
# Virtualbox provider
|
# Virtualbox provider
|
||||||
config.vm.provider :virtualbox do |vbox|
|
config.vm.provider :virtualbox do |vbox|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user