Skip to content
This repository has been archived by the owner on Feb 13, 2023. It is now read-only.

Commit

Permalink
Issue #814: Update Vagrantfile and docs for roles-in-VM.
Browse files Browse the repository at this point in the history
  • Loading branch information
geerlingguy committed Jul 23, 2016
1 parent db7699c commit 443999d
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 7 deletions.
2 changes: 0 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
if which('ansible-playbook')
config.vm.provision 'ansible' do |ansible|
ansible.playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
ansible.galaxy_role_file = "#{host_drupalvm_dir}/provisioning/requirements.yml"
ansible.extra_vars = {
config_dir: host_config_dir
}
Expand All @@ -137,7 +136,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# else
# config.vm.provision "ansible_local" do |ansible|
# ansible.playbook = "#{guest_drupalvm_dir}/provisioning/playbook.yml"
# ansible.galaxy_role_file = "#{guest_drupalvm_dir}/provisioning/requirements.yml"
# ansible.extra_vars = {
# config_dir: guest_config_dir
# }
Expand Down
3 changes: 0 additions & 3 deletions docs/other/overriding-configurations.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ config.vm.provider :virtualbox do |v|
# Cap the host CPU execution at 50% usage.
v.customize ["modifyvm", :id, "--cpuexecutioncap", "50"]
end
# Disable the galaxy role re-installation during provisions.
config.vm.provisioners[0].config.galaxy_role_file = nil
```

### Example: Using the `vagrant-aws` provider
Expand Down
2 changes: 0 additions & 2 deletions docs/other/php-56.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Drupal VM defaults to PHP 7, but you can install and use 5.6 if you need to maximize compatibility with older Drupal 6 and 7 sites.

_Note: If you have Ansible installed on your host machine, make sure you're running the latest version of all Ansible role dependencies by running `ansible-galaxy install -r provisioning/requirements.yml --force` inside the root Drupal VM project folder._

## Ubuntu 16.04

Ubuntu 16.04 Xenial defaults to PHP 7.0 in it's system packages. No older versions of PHP will be supported if using this base box.
Expand Down

0 comments on commit 443999d

Please sign in to comment.