From c89a9bccc76d8e30a6b2054cd89693e09927a855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= <m@oxy.fi>
Date: Sat, 23 Sep 2017 12:45:18 -0500
Subject: [PATCH] Hide ansible deprecation warnings in regular provision mode

---
 Vagrantfile                    | 9 ++++++---
 provisioning/ansible.cfg       | 1 +
 provisioning/ansible.debug.cfg | 5 +++++
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 provisioning/ansible.debug.cfg

diff --git a/Vagrantfile b/Vagrantfile
index 647a45109..7fac14aec 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -29,10 +29,10 @@ vconfig = load_config([
 
 provisioner = vconfig['force_ansible_local'] ? :ansible_local : vagrant_provisioner
 if provisioner == :ansible
-  playbook = "#{host_drupalvm_dir}/provisioning/playbook.yml"
+  provisioning_dir = "#{host_drupalvm_dir}/provisioning"
   config_dir = host_config_dir
 else
-  playbook = "#{guest_drupalvm_dir}/provisioning/playbook.yml"
+  provisioning_dir = "#{guest_drupalvm_dir}/provisioning"
   config_dir = guest_config_dir
 end
 
@@ -103,7 +103,7 @@ Vagrant.configure('2') do |config|
   end
 
   config.vm.provision provisioner do |ansible|
-    ansible.playbook = playbook
+    ansible.playbook = "#{provisioning_dir}/playbook.yml"
     ansible.extra_vars = {
       config_dir: config_dir,
       drupalvm_env: drupalvm_env
@@ -111,6 +111,9 @@ Vagrant.configure('2') do |config|
     ansible.raw_arguments = Shellwords.shellsplit(ENV['DRUPALVM_ANSIBLE_ARGS']) if ENV['DRUPALVM_ANSIBLE_ARGS']
     ansible.tags = ENV['DRUPALVM_ANSIBLE_TAGS']
     ansible.verbose = ENV['DRUPALVM_DEBUG']
+    unless ENV['ANSIBLE_CONFIG']
+      ansible.config_file = "#{provisioning_dir}/ansible#{'.debug' if ENV['DRUPALVM_DEBUG']}.cfg"
+    end
     # Use pip to get the latest Ansible version when using ansible_local.
     provisioner == :ansible_local && ansible.install_mode = 'pip'
   end
diff --git a/provisioning/ansible.cfg b/provisioning/ansible.cfg
index 0017b8152..f2d561ee8 100644
--- a/provisioning/ansible.cfg
+++ b/provisioning/ansible.cfg
@@ -1,5 +1,6 @@
 [defaults]
 roles_path = ./roles
+deprecation_warnings = False
 
 [ssh_connection]
 pipelining = True
diff --git a/provisioning/ansible.debug.cfg b/provisioning/ansible.debug.cfg
new file mode 100644
index 000000000..0017b8152
--- /dev/null
+++ b/provisioning/ansible.debug.cfg
@@ -0,0 +1,5 @@
+[defaults]
+roles_path = ./roles
+
+[ssh_connection]
+pipelining = True