Merge pull request #995 from oxyc/env-configs

Issue #455: Allow for environment specific config files

Vagrantfile

@@ -12,6 +12,8 @@ guest_project_dir = '/vagrant'
 guest_drupalvm_dir = ENV['DRUPALVM_DIR'] ? "/vagrant/#{ENV['DRUPALVM_DIR']}" : guest_project_dir
 guest_config_dir = ENV['DRUPALVM_CONFIG_DIR'] ? "/vagrant/#{ENV['DRUPALVM_CONFIG_DIR']}" : guest_project_dir
 
+drupalvm_env = ENV['DRUPALVM_ENV'] || 'vagrant'
+
 # Cross-platform way of finding an executable in the $PATH.
 def which(cmd)
   exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
@@ -38,7 +40,7 @@ require 'yaml'
 # Load default VM configurations.
 vconfig = YAML.load_file("#{host_drupalvm_dir}/default.config.yml")
 # Use optional config.yml and local.config.yml for configuration overrides.
-['config.yml', 'local.config.yml'].each do |config_file|
+['config.yml', 'local.config.yml', "#{drupalvm_env}.config.yml"].each do |config_file|
   if File.exist?("#{host_config_dir}/#{config_file}")
     vconfig.merge!(YAML.load_file("#{host_config_dir}/#{config_file}"))
   end
@@ -124,14 +126,16 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.provision 'ansible' do |ansible|
       ansible.playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
       ansible.extra_vars = {
-        config_dir: host_config_dir
+        config_dir: host_config_dir,
+        drupalvm_env: drupalvm_env
       }
     end
   else
     config.vm.provision 'ansible_local' do |ansible|
       ansible.playbook = "#{guest_drupalvm_dir}/provisioning/playbook.yml"
       ansible.extra_vars = {
-        config_dir: guest_config_dir
+        config_dir: guest_config_dir,
+        drupalvm_env: drupalvm_env
       }
     end
   end

provisioning/playbook.yml

@@ -22,6 +22,7 @@
       with_fileglob:
         - "{{ config_dir }}/config.yml"
         - "{{ config_dir }}/local.config.yml"
+        - "{{ config_dir }}/{{ lookup('env', 'DRUPALVM_ENV')|default(drupalvm_env, true)|default(ansible_env.DRUPALVM_ENV)|default(omit) }}.config.yml"
 
     - include: tasks/init-debian.yml
       when: ansible_os_family == 'Debian'