ref(Vagrantfile): align with upstream coreos-vagrant

See "deis" fork at https://github.com/deis/coreos-vagrant

Author: mboersma

Vagrantfile

@@ -1,64 +1,130 @@
 # -*- mode: ruby -*-
 # # vi: set ft=ruby :
 
-DEIS_NUM_INSTANCES = (ENV['DEIS_NUM_INSTANCES'].to_i > 0 && ENV['DEIS_NUM_INSTANCES'].to_i) || 1
+require 'fileutils'
 
-if DEIS_NUM_INSTANCES == 1
-  mem = 4096
-  cpus = 2
+Vagrant.require_version ">= 1.6.0"
+
+CLOUD_CONFIG_PATH = File.join(File.dirname(__FILE__), "contrib", "coreos", "user-data")
+CONFIG = File.join(File.dirname(__FILE__), "config.rb")
+
+# Defaults for config options defined in CONFIG
+$num_instances = 1
+$update_channel = "alpha"
+$enable_serial_logging = false
+$vb_gui = false
+$vb_memory = 1024
+$vb_cpus = 1
+
+# Attempt to apply the deprecated environment variable NUM_INSTANCES to
+# $num_instances while allowing config.rb to override it
+if ENV["NUM_INSTANCES"].to_i > 0 && ENV["NUM_INSTANCES"]
+  $num_instances = ENV["NUM_INSTANCES"].to_i
+elsif ENV["DEIS_NUM_INSTANCES"].to_i > 0 && ENV["DEIS_NUM_INSTANCES"]
+  $num_instances = ENV["DEIS_NUM_INSTANCES"].to_i
+else
+  $num_instances = 3
+end
+
+# VM sizing for Deis
+if $num_instances == 1
+  $vb_memory = 4096
+  $vb_cpus = 2
 else
-  mem = 2048
-  cpus = 1
+  $vb_memory = 2048
+  $vb_cpus = 1
 end
 
 COREOS_VERSION = "444.0.0"
 
+if File.exist?(CONFIG)
+  require CONFIG
+end
+
 Vagrant.configure("2") do |config|
+  # config.vm.box = "coreos-%s" % $update_channel
+  # config.vm.box_version = ">= 308.0.1"
+  # config.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json" % $update_channel
   config.vm.box = "coreos-#{COREOS_VERSION}"
   config.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/#{COREOS_VERSION}/coreos_production_vagrant.box"
 
   config.vm.provider :vmware_fusion do |vb, override|
+    # override.vm.box_url = "http://%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant_vmware_fusion.json" % $update_channel
     override.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/#{COREOS_VERSION}/coreos_production_vagrant_vmware_fusion.box"
   end
 
   config.vm.provider :virtualbox do |vb, override|
+    # Use AMD Lance nic which seems less problematic than Intel
     vb.customize ["modifyvm", :id, "--nictype1", "Am79C973"]
     vb.customize ["modifyvm", :id, "--nictype2", "Am79C973"]
-    # Fix docker not being able to resolve private registry in VirtualBox
-    vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
-    vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
+  end
+
+  config.vm.provider :virtualbox do |v|
+    # On VirtualBox, we don't have guest additions or a functional vboxsf
+    # in CoreOS, so tell Vagrant that so it can be smarter.
+    v.check_guest_additions = false
+    v.functional_vboxsf     = false
   end
 
   # plugin conflict
   if Vagrant.has_plugin?("vagrant-vbguest") then
     config.vbguest.auto_update = false
   end
-  #plugin conflict
-  if Vagrant.has_plugin?("vagrant-cachier") then
-    config.cache.disable!
-  end
 
-  (1..DEIS_NUM_INSTANCES).each do |i|
-    config.vm.define vm_name = "deis-#{i}" do |config|
+  (1..$num_instances).each do |i|
+    config.vm.define vm_name = "deis-%d" % i do |config|
       config.vm.hostname = vm_name
 
+      if $enable_serial_logging
+        logdir = File.join(File.dirname(__FILE__), "log")
+        FileUtils.mkdir_p(logdir)
+
+        serialFile = File.join(logdir, "%s-serial.txt" % vm_name)
+        FileUtils.touch(serialFile)
+
+        config.vm.provider :vmware_fusion do |v, override|
+          v.vmx["serial0.present"] = "TRUE"
+          v.vmx["serial0.fileType"] = "file"
+          v.vmx["serial0.fileName"] = serialFile
+          v.vmx["serial0.tryNoRxLoss"] = "FALSE"
+        end
+
+        config.vm.provider :virtualbox do |vb, override|
+          vb.customize ["modifyvm", :id, "--uart1", "0x3F8", "4"]
+          vb.customize ["modifyvm", :id, "--uartmode1", serialFile]
+        end
+      end
+
+      if $expose_docker_tcp
+        config.vm.network "forwarded_port", guest: 2375, host: ($expose_docker_tcp + i - 1), auto_correct: true
+      end
+
+      config.vm.provider :vmware_fusion do |vb|
+        vb.gui = $vb_gui
+      end
+
       config.vm.provider :virtualbox do |vb|
-        vb.memory = mem
-        vb.cpus = cpus
+        vb.gui = $vb_gui
+        vb.memory = $vb_memory
+        vb.cpus = $vb_cpus
       end
 
       ip = "172.17.8.#{i+99}"
       config.vm.network :private_network, ip: ip
 
-      # user-data bootstrapping
-      config.vm.provision :file, :source => "contrib/coreos/user-data", :destination => "/tmp/vagrantfile-user-data"
-      # check that the CoreOS user-data file is valid
-      config.vm.provision :shell do |s|
-        s.path = "contrib/util/check-user-data.sh"
-        s.args = ["/tmp/vagrantfile-user-data", "#{DEIS_NUM_INSTANCES}"]
+      # Uncomment below to enable NFS for sharing the host machine into the coreos-vagrant VM.
+      #config.vm.synced_folder ".", "/home/core/share", id: "core", :nfs => true, :mount_options => ['nolock,vers=3,udp']
+
+      if File.exist?(CLOUD_CONFIG_PATH)
+        config.vm.provision :file, :source => "#{CLOUD_CONFIG_PATH}", :destination => "/tmp/vagrantfile-user-data"
+        # check that the CoreOS user-data file is valid
+        config.vm.provision :shell do |s|
+          s.path = File.join(File.dirname(__FILE__), "contrib", "util", "check-user-data.sh")
+          s.args = ["/tmp/vagrantfile-user-data", $num_instances]
+        end
+        config.vm.provision :shell, :inline => "mv /tmp/vagrantfile-user-data /var/lib/coreos-vagrant/", :privileged => true
       end
-      config.vm.provision :shell, :inline => "mv /tmp/vagrantfile-user-data /var/lib/coreos-vagrant/", :privileged => true
+
     end
   end
-
 end