Merge pull request #1562 from oxyc/issue-1520

Fixes #1520: Let local.config.yml override environment.config.yml

Author: geerlingguy

Vagrantfile

@@ -23,8 +23,8 @@ end
 vconfig = load_config([
   default_config_file,
   "#{host_config_dir}/config.yml",
-  "#{host_config_dir}/local.config.yml",
-  "#{host_config_dir}/#{drupalvm_env}.config.yml"
+  "#{host_config_dir}/#{drupalvm_env}.config.yml",
+  "#{host_config_dir}/local.config.yml"
 ])
 
 provisioner = vconfig['force_ansible_local'] ? :ansible_local : vagrant_provisioner

docs/getting-started/configure-drupalvm.md

@@ -20,7 +20,13 @@ vagrant_machine_name: my_custom_site
 php_version: "5.6"
 ```
 
-#### 3. local.config.yml
+#### 3. vagrant.config.yml
+
+Environment specific overrides. When you run Drupal VM through _Vagrant_, the environment will be set to `vagrant` and this file is loaded when available. If you're doing something more advanced, such as running Drupal VM on a [production environment](../other/production.md), you can use a different environment configuration file, eg `prod.config.yml`.
+
+_Note: In addition to the variables listed in `default.config.yml`, you can also override the variables set by any of the ansible roles. In the "Installed extras" section of this documentation, each role has a link to the available variables._
+
+#### 4. local.config.yml
 
 Local development overrides. Commonly this file is ignored from VCS so that each team member can make local customizations.
 
@@ -37,12 +43,6 @@ vagrant_synced_folders:
     create: true
 ```
 
-### 4. vagrant.config.yml
-
-Environment specific overrides. When you run Drupal VM through _Vagrant_, the environment will be set to `vagrant` and this file is loaded when available. If you're doing something more advanced, such as running Drupal VM on a [production environment](../other/production.md), you can use a different environment configuration file, eg `prod.config.yml`.
-
-_Note: In addition to the variables listed in `default.config.yml`, you can also override the variables set by any of the ansible roles. In the "Installed extras" section of this documentation, each role has a link to the available variables._
-
 ## Additional resources
 
 - Jeff Geerling's DrupalDC talk "[Drupal VM Tips and Tricks for Drupal 8 development](https://www.youtube.com/watch?v=_wV6MDsT42Y)"

provisioning/tasks/config.yml

@@ -11,6 +11,6 @@
   include_vars: "{{ item }}"
   with_fileglob:
     - "{{ config_dir }}/config.yml"
-    - "{{ config_dir }}/local.config.yml"
     - "{{ config_dir }}/secrets.yml"
     - "{{ config_dir }}/{{ lookup('env', 'DRUPALVM_ENV')|default(drupalvm_env, true)|default(ansible_env.DRUPALVM_ENV)|default(omit) }}.config.yml"
+    - "{{ config_dir }}/local.config.yml"