diff --git a/README.md b/README.md index a11feb3cb..962d8da45 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ Notes: - **For faster provisioning** (macOS/Linux only): *[Install Ansible](http://docs.ansible.com/intro_installation.html) on your host machine, so Drupal VM can run the provisioning steps locally instead of inside the VM.* - **NFS on Linux**: *If NFS is not already installed on your host, you will need to install it to use the default NFS synced folder configuration. See guides for [Debian/Ubuntu](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-ubuntu-14-04), [Arch](https://wiki.archlinux.org/index.php/NFS#Installation), and [RHEL/CentOS](https://www.digitalocean.com/community/tutorials/how-to-set-up-an-nfs-mount-on-centos-6).* - - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of February 2016, Drupal VM recommends: Vagrant 1.8.4, VirtualBox 5.0.24, and Ansible 2.1.0.* + - **Versions**: *Make sure you're running the latest releases of Vagrant, VirtualBox, and Ansible—as of February 2016, Drupal VM recommends: Vagrant 1.8.5, VirtualBox 5.0.24, and Ansible 2.1.0.* ### 2 - Build the Virtual Machine diff --git a/Vagrantfile b/Vagrantfile index 7cc087dfe..737412aa0 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -118,7 +118,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Allow override of the default synced folder type. config.vm.synced_folder host_project_dir, '/vagrant', type: vconfig.include?('vagrant_synced_folder_default_type') ? vconfig['vagrant_synced_folder_default_type'] : 'nfs' - # Provisioning. Use ansible if it's installed, JJG-Ansible-Windows if not. + # Provisioning. Use ansible if it's installed, ansible_local if not. if which('ansible-playbook') config.vm.provision 'ansible' do |ansible| ansible.playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml" @@ -127,20 +127,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| } end else - config.vm.provision 'shell' do |sh| - sh.path = "#{host_drupalvm_dir}/provisioning/JJG-Ansible-Windows/windows.sh" - sh.args = "-e 'config_dir=\"#{guest_config_dir}\"' #{guest_drupalvm_dir}/provisioning/playbook.yml" + config.vm.provision "ansible_local" do |ansible| + ansible.playbook = "#{guest_drupalvm_dir}/provisioning/playbook.yml" + ansible.extra_vars = { + config_dir: guest_config_dir + } end end - # ansible_local provisioner is broken in Vagrant < 1.8.2. - # else - # config.vm.provision "ansible_local" do |ansible| - # ansible.playbook = "#{guest_drupalvm_dir}/provisioning/playbook.yml" - # ansible.extra_vars = { - # config_dir: guest_config_dir - # } - # end - # end # VMware Fusion. config.vm.provider :vmware_fusion do |v, override|