diff --git a/consul-ansible/Vagrantfile b/consul-ansible/Vagrantfile index d19d0de..fc0ca2c 100644 --- a/consul-ansible/Vagrantfile +++ b/consul-ansible/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and desired clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml' module require 'yaml' diff --git a/consul/Vagrantfile b/consul/Vagrantfile index fbd20b6..cb4e327 100644 --- a/consul/Vagrantfile +++ b/consul/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and Vagrant clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml' module require 'yaml' diff --git a/coreos-cloudinit-toolbox/Vagrantfile b/coreos-cloudinit-toolbox/Vagrantfile index 924adf3..90d5df8 100644 --- a/coreos-cloudinit-toolbox/Vagrantfile +++ b/coreos-cloudinit-toolbox/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and Vagrant clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml', 'fileutils', and 'erb' modules require 'yaml' diff --git a/debian-generic/Vagrantfile b/debian-generic/Vagrantfile index 8e45c48..3a63f7a 100644 --- a/debian-generic/Vagrantfile +++ b/debian-generic/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and Vagrant clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml' module require 'yaml' diff --git a/docker-ipvlan-l3/Vagrantfile b/docker-ipvlan-l3/Vagrantfile index 846c999..507d4f1 100644 --- a/docker-ipvlan-l3/Vagrantfile +++ b/docker-ipvlan-l3/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and desired clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml' module require 'yaml' diff --git a/docker-ipvlan/Vagrantfile b/docker-ipvlan/Vagrantfile index a60b0e7..3264809 100644 --- a/docker-ipvlan/Vagrantfile +++ b/docker-ipvlan/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and desired clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml' module require 'yaml' diff --git a/docker-macvlan/Vagrantfile b/docker-macvlan/Vagrantfile index 3981fe1..ad19f26 100644 --- a/docker-macvlan/Vagrantfile +++ b/docker-macvlan/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and desired clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml' module require 'yaml' diff --git a/docker-swarm-ha/Vagrantfile b/docker-swarm-ha/Vagrantfile index 9470d6b..85b381c 100644 --- a/docker-swarm-ha/Vagrantfile +++ b/docker-swarm-ha/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and Vagrant clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml', 'fileutils', and 'erb' modules require 'yaml' diff --git a/ipvs-docker/Vagrantfile b/ipvs-docker/Vagrantfile index 4f00501..e0e1ccf 100644 --- a/ipvs-docker/Vagrantfile +++ b/ipvs-docker/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and desired clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml' module require 'yaml' diff --git a/junos/Vagrantfile b/junos/Vagrantfile index 048fd5d..3248052 100644 --- a/junos/Vagrantfile +++ b/junos/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and desired clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml' module require 'yaml' diff --git a/lxc/Vagrantfile b/lxc/Vagrantfile index c69eca3..89ad1ad 100644 --- a/lxc/Vagrantfile +++ b/lxc/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and desired clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml' module require 'yaml' diff --git a/lxd-ansible/Vagrantfile b/lxd-ansible/Vagrantfile index c69eca3..89ad1ad 100644 --- a/lxd-ansible/Vagrantfile +++ b/lxd-ansible/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and desired clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml' module require 'yaml' diff --git a/lxd-shell/Vagrantfile b/lxd-shell/Vagrantfile index f9e3edb..9216e10 100644 --- a/lxd-shell/Vagrantfile +++ b/lxd-shell/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and Vagrant clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml' module require 'yaml' diff --git a/openstack-cli/Vagrantfile b/openstack-cli/Vagrantfile index 0f0dd2f..a051bf1 100644 --- a/openstack-cli/Vagrantfile +++ b/openstack-cli/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version and Vagrant API version Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml' module require 'yaml' diff --git a/photon-cloudinit/Vagrantfile b/photon-cloudinit/Vagrantfile index 2077c6d..6ae7750 100644 --- a/photon-cloudinit/Vagrantfile +++ b/photon-cloudinit/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and Vagrant clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml' module require 'yaml' diff --git a/photon/Vagrantfile b/photon/Vagrantfile index 7224c1f..4ed7963 100644 --- a/photon/Vagrantfile +++ b/photon/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and Vagrant clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml' module require 'yaml' diff --git a/rkt/Vagrantfile b/rkt/Vagrantfile index 982b47b..06c7198 100644 --- a/rkt/Vagrantfile +++ b/rkt/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and Vagrant clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml' module require 'yaml' diff --git a/ssh-bastion/Vagrantfile b/ssh-bastion/Vagrantfile index 5f57a53..8b307cd 100644 --- a/ssh-bastion/Vagrantfile +++ b/ssh-bastion/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and Vagrant clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml' module require 'yaml' diff --git a/ubuntu-generic/Vagrantfile b/ubuntu-generic/Vagrantfile index 543a2e9..2cd73b6 100644 --- a/ubuntu-generic/Vagrantfile +++ b/ubuntu-generic/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and Vagrant clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'yaml' module require 'yaml' diff --git a/vagrant-docker-json/Vagrantfile b/vagrant-docker-json/Vagrantfile index 6a9b1ed..2afd9a9 100644 --- a/vagrant-docker-json/Vagrantfile +++ b/vagrant-docker-json/Vagrantfile @@ -2,9 +2,8 @@ # vi: set ft=ruby : # Specify Vagrant version, Vagrant API version, and Vagrant clone location -Vagrant.require_version ">= 1.6.0" -VAGRANTFILE_API_VERSION = "2" -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' +Vagrant.require_version '>= 1.6.0' +VAGRANTFILE_API_VERSION = '2' ENV['VAGRANT_DEFAULT_PROVIDER'] = 'docker' # Require 'json' module @@ -20,30 +19,30 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Perform one-time configuration of Docker provider to specify # location of Vagrantfile for host VM; comment out this section # to use default boot2docker box - config.vm.provider "docker" do |docker| - docker.vagrant_vagrantfile = "host/Vagrantfile" + config.vm.provider 'docker' do |docker| + docker.vagrant_vagrantfile = 'host/Vagrantfile' end # config.vm.provider # Iterate through the entries in the YAML file containers.each do |container| - config.vm.define container["name"] do |cntnr| + config.vm.define container['name'] do |cntnr| # Disable synced folders for the Docker container - # (prevents an NFS error on "vagrant up") - cntnr.vm.synced_folder ".", "/vagrant", disabled: true + # (prevents an NFS error on 'vagrant up') + cntnr.vm.synced_folder '.', '/vagrant', disabled: true # Configure the Docker provider for Vagrant - cntnr.vm.provider "docker" do |docker| + cntnr.vm.provider 'docker' do |docker| # Specify the Docker image to use, pull value from YAML file - docker.image = container["image"] + docker.image = container['image'] # Specify port mappings, pull value from YAML file # If omitted, no ports are mapped! - docker.ports = container["ports"] + docker.ports = container['ports'] # Specify a friendly name for the Docker container, pull from YAML file - docker.name = container["name"] + docker.name = container['name'] end # contnr.vm.provider end # config.vm.define end # containers.each diff --git a/vagrant-docker-yaml/Vagrantfile b/vagrant-docker-yaml/Vagrantfile index 5e7b013..0aea644 100644 --- a/vagrant-docker-yaml/Vagrantfile +++ b/vagrant-docker-yaml/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and Vagrant clone location Vagrant.require_version ">= 1.6.0" VAGRANTFILE_API_VERSION = "2" -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' ENV['VAGRANT_DEFAULT_PROVIDER'] = 'docker' # Require 'yaml' module diff --git a/vagrant-docker/host/Vagrantfile b/vagrant-docker/host/Vagrantfile index 9909f47..402a91f 100644 --- a/vagrant-docker/host/Vagrantfile +++ b/vagrant-docker/host/Vagrantfile @@ -2,15 +2,14 @@ # vi: set ft=ruby : # Specify Vagrant version, Vagrant API version, and Vagrant clone location -Vagrant.require_version ">= 1.6.0" -VAGRANTFILE_API_VERSION = "2" -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' +Vagrant.require_version '>= 1.6.0' +VAGRANTFILE_API_VERSION = '2' # Create and configure the VM(s) Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Assign a friendly name to this host VM - config.vm.hostname = "docker-host" + config.vm.hostname = 'docker-host' # Skip checking for an updated Vagrant box config.vm.box_check_update = false @@ -18,15 +17,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Always use Vagrant's default insecure key config.ssh.insert_key = false - # Spin up a "host box" for use with the Docker provider + # Spin up a 'host box' for use with the Docker provider # and then provision it with Docker - config.vm.box = "slowe/ubuntu-trusty-x64" - config.vm.provision "docker" + config.vm.box = 'slowe/ubuntu-trusty-x64' + config.vm.provision 'docker' # Kill SSH connection to Docker Host # Workaround for Vagrant issue #3998 related to group memberships - config.vm.provision "shell", inline: "ps aux | grep 'sshd:' | awk '{print $2}' | xargs kill" + config.vm.provision 'shell', inline: 'ps aux | grep 'sshd:' | awk '{print $2}' | xargs kill' - # Disable synced folders (prevents an NFS error on "vagrant up") - config.vm.synced_folder ".", "/vagrant", disabled: true + # Disable synced folders (prevents an NFS error on 'vagrant up') + config.vm.synced_folder '.', '/vagrant', disabled: true end diff --git a/vagrant-json/Vagrantfile b/vagrant-json/Vagrantfile index 4e7ef57..9ad5277 100644 --- a/vagrant-json/Vagrantfile +++ b/vagrant-json/Vagrantfile @@ -4,7 +4,6 @@ # Specify Vagrant version, Vagrant API version, and desired clone location Vagrant.require_version '>= 1.6.0' VAGRANTFILE_API_VERSION = '2' -ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant' # Require 'json' module require 'json'