Skip to content
Snippets Groups Projects
Commit 16e38081 authored by User expired's avatar User expired
Browse files

fixing problems on vagrant up

parent 8e7b3561
No related branches found
No related tags found
No related merge requests found
...@@ -15,18 +15,18 @@ else ...@@ -15,18 +15,18 @@ else
end end
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Hardware configuration
config.vm.provider "virtualbox" do |v|
v.name = (isLocalMode ? "isochrone-local" : "isochrone")
v.cpus = 2
v.memory = 3072
end
# Enable vagrant-cachier plugin # Enable vagrant-cachier plugin
if VagrantPlugins.const_defined?(:Cachier) if VagrantPlugins.const_defined?(:Cachier)
config.cache.enable :yum config.cache.enable :yum
end end
# VM name
if isLocalMode
config.name = "isochrone"
else
config.name = "isochrone-local"
end
# Information about the box itself (name and url) # Information about the box itself (name and url)
# config.vm.box = "fedora19-x86_64" # config.vm.box = "fedora19-x86_64"
# config.vm.box_url = "http://www.krismer.de/files/VM/fedora19-x86_64.box" # config.vm.box_url = "http://www.krismer.de/files/VM/fedora19-x86_64.box"
...@@ -42,10 +42,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| ...@@ -42,10 +42,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box_url = "http://files.brianbirkinbine.com/vagrant-centos-65-i386-minimal.box" config.vm.box_url = "http://files.brianbirkinbine.com/vagrant-centos-65-i386-minimal.box"
end end
# Hardware configuration
config.cpus = 2
config.memory = 3072
# Setup of shared folders # Setup of shared folders
config.vm.synced_folder "etc/vagrant/conf", "/setup/conf" config.vm.synced_folder "etc/vagrant/conf", "/setup/conf"
config.vm.synced_folder "etc/vagrant/img", "/setup/img" config.vm.synced_folder "etc/vagrant/img", "/setup/img"
......
...@@ -5,13 +5,18 @@ ...@@ -5,13 +5,18 @@
VAGRANTFILE_API_VERSION = "2" VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Hardware configuration
config.vm.provider "virtualbox" do |v|
v.name = "isochrone"
v.cpus = 2
v.memory = 3072
end
# Enable vagrant-cachier plugin # Enable vagrant-cachier plugin
if VagrantPlugins.const_defined?(:Cachier) if VagrantPlugins.const_defined?(:Cachier)
config.cache.enable :yum config.cache.enable :yum
end end
config.name = "isochrone"
# Information about the box itself (name and url) # Information about the box itself (name and url)
# config.vm.box = "fedora19-x86_64" # config.vm.box = "fedora19-x86_64"
# config.vm.box_url = "http://www.krismer.de/files/VM/fedora19-x86_64.box" # config.vm.box_url = "http://www.krismer.de/files/VM/fedora19-x86_64.box"
...@@ -24,10 +29,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| ...@@ -24,10 +29,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "vagrant-centos-65-x86_64-minimal" config.vm.box = "vagrant-centos-65-x86_64-minimal"
config.vm.box_url = "http://files.brianbirkinbine.com/vagrant-centos-65-x86_64-minimal.box" config.vm.box_url = "http://files.brianbirkinbine.com/vagrant-centos-65-x86_64-minimal.box"
# Hardware configuration
config.cpus = 2
config.memory = 3072
# Setup of shared folders # Setup of shared folders
config.vm.synced_folder "vagrant/conf", "/setup/conf" config.vm.synced_folder "vagrant/conf", "/setup/conf"
config.vm.synced_folder "vagrant/img", "/setup/img" config.vm.synced_folder "vagrant/img", "/setup/img"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment