Convert vagrantfile to salt

.vim/vimrc

@@ -307,6 +307,12 @@ augroup vagrant
     autocmd BufRead,BufNewFile [vV]agrantfile setlocal softtabstop=2
 augroup END
 
+augroup yaml
+    autocmd FileType yaml setlocal tabstop=2
+    autocmd FileType yaml setlocal shiftwidth=2
+    autocmd FileType yaml setlocal softtabstop=2
+augroup END
+
 augroup docker
     autocmd!
     autocmd FileType dockerfile setlocal formatoptions-=t

Vagrantfile

@@ -1,67 +1,47 @@
 # User information
 USERNAME = ENV['USER']
-NAME = %x< git config user.name >.strip
+FULLNAME = %x< git config user.name >.strip
 EMAIL = %x< git config user.email >.strip
 
+# Repo information
+BRANCH = %x< git rev-parse  --abbrev-ref HEAD 2\>/dev/null >.strip
+
 # Machine information
 HOSTNAME = %x< hostname >.strip + '-dev'
 
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+# Vagrantfile API/syntax version. Don't touch unless you know what you're 
+# doing!
 VAGRANTFILE_API_VERSION = "2"
 
-class String
-  # Strip leading whitespace from each line that is the same as the
-  # amount of whitespace on the first line of the string.
-  # Leaves _additional_ indentation on later lines intact.
-  # SEE: http://stackoverflow.com/a/5638187/504018
-  def unindent
-    gsub(/^#{self[/\A\s*/]}/, '')
-  end
-end
-
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  # Every Vagrant virtual environment requires a box to build off of.
   config.vm.box = "trusty-server-cloudimg-amd64-vagrant-disk1"
+  config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/#{config.vm.box}.box"
 
-  # The url from where the 'config.vm.box' box will be fetched if it
-  # doesn't already exist on the user's system.
-  config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/#{config.vm.box}.box"
-
-  # Create a public network, which generally matched to bridged network.
-  # Bridged networks make the machine appear as another physical device on
-  # your network.
   config.vm.network :public_network
-  config.vm.network "forwarded_port", guest: 8000, host: 8000
+  config.vm.network :forwarded_port, guest: 8000, host: 8000
+
+  config.vm.synced_folder "salt/roots", "/srv/"
 
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
   config.vm.provider :virtualbox do |vb|
-    # Don't boot with headless mode
     vb.gui = true
+    vb.cpus = 2
+    vb.memory = 1024
     vb.name = HOSTNAME
-
-    # Use VBoxManage to customize the VM.
-    vb.customize ["modifyvm", :id, "--memory", "1024"]
-    vb.customize ["modifyvm", :id, "--cpus", "2"]
     vb.customize ["modifyvm", :id, "--usb", "on"]
-    vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
-    vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
   end
 
-  # Set up the hostname as requested in the config file.
-  config.vm.provision :shell, inline: <<-SH.unindent
-    sed -i "s/$(hostname)/#{HOSTNAME}/g" /etc/hosts
-    echo #{HOSTNAME} > /etc/hostname
-    service hostname restart
-  SH
-
-  config.vm.provision :shell, inline: "/vagrant/vagrant/setup-packages"
-  config.vm.provision :shell, inline: "/vagrant/vagrant/setup-docker"
-  config.vm.provision :shell, inline: "/vagrant/vagrant/setup-user '#{USERNAME}' '#{NAME}' '#{EMAIL}'"
-
-  # Remove unneeded packages.
-  config.vm.provision :shell, inline: <<-SH.unindent
-    apt-get clean -q -y
-  SH
-
+  config.vm.provision :salt do |salt|
+    salt.minion_config = "salt/minion"
+    salt.run_highstate = true
+    salt.log_level = "debug"
+    salt.verbose = true
+    salt.colorize = true
+
+    salt.pillar({
+      hostname: HOSTNAME,
+      username: USERNAME,
+      fullname: FULLNAME,
+      useremail: EMAIL,
+    })
+  end
 end