x/solar
Code Issues Proposed changes

Paravirt provider is customizable from vagrant-settings.yaml

Browse Source
This commit is contained in:
Jedrzej Nowak 2015-09-17 15:47:35 +02:00
parent 70171f3ff9
commit a563998a1b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Vagrantfile vendored
View File

@ -38,6 +38,7 @@ MASTER_IMAGE = cfg["master_image"]
SYNC_TYPE = cfg["sync_type"] SYNC_TYPE = cfg["sync_type"]
MASTER_CPUS = cfg["master_cpus"] MASTER_CPUS = cfg["master_cpus"]
SLAVES_CPUS = cfg["slaves_cpus"] SLAVES_CPUS = cfg["slaves_cpus"]
PARAVIRT_PROVIDER = cfg.fetch('paravirtprovider', false)
def ansible_playbook_command(filename, args=[]) def ansible_playbook_command(filename, args=[])
"ansible-playbook -v -i \"localhost,\" -c local /vagrant/bootstrap/playbooks/#{filename} #{args.join ' '}" "ansible-playbook -v -i \"localhost,\" -c local /vagrant/bootstrap/playbooks/#{filename} #{args.join ' '}"
@ -113,9 +114,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
"modifyvm", :id, "modifyvm", :id,
"--memory", SLAVES_RAM, "--memory", SLAVES_RAM,
"--cpus", SLAVES_CPUS, "--cpus", SLAVES_CPUS,
"--paravirtprovider", "kvm", # for linux guest
"--ioapic", "on", "--ioapic", "on",
] ]
if PARAVIRT_PROVIDER
v.customize ['modifyvm', :id, "--paravirtprovider", PARAVIRT_PROVIDER] # for linux guest
end
v.name = "solar-dev#{index}" v.name = "solar-dev#{index}"
end end

5
vagrant-settings.yaml_defaults
View File

@ -8,6 +8,11 @@ slaves_image: cgenie/solar-master
master_ram: 1024 master_ram: 1024
master_cpus: 1 master_cpus: 1
slaves_cpus: 1 slaves_cpus: 1
# if you have virtualbox 5.x then enable it
# if will speedup things a lot
# paravirtprovider: kvm
# By default Virtualbox shared folder is used which is very slow # By default Virtualbox shared folder is used which is very slow
# Uncomment following option to change it. # Uncomment following option to change it.
# Possible options are: rsync, nfs # Possible options are: rsync, nfs