From 2b2cb0aaaadffdfbc2c01d0a23edca7a3c43f15c Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Fri, 18 Aug 2017 23:04:39 -0500
Subject: [PATCH] Fixes #1495: Update Drupal role so composer install can be
 skipped on deploy.

---
 provisioning/requirements.yml                           | 2 +-
 provisioning/roles/geerlingguy.drupal/README.md         | 4 ++++
 provisioning/roles/geerlingguy.drupal/defaults/main.yml | 1 +
 provisioning/roles/geerlingguy.drupal/tasks/deploy.yml  | 4 +++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
index 85db0e8bc..4f16a5a36 100644
--- a/provisioning/requirements.yml
+++ b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.1.1
 - src: geerlingguy.drupal
-  version: 2.3.1
+  version: 2.4.0
 - src: geerlingguy.drupal-console
   version: 1.1.0
 - src: geerlingguy.drush
diff --git a/provisioning/roles/geerlingguy.drupal/README.md b/provisioning/roles/geerlingguy.drupal/README.md
index 71d9bc513..49de79b9b 100644
--- a/provisioning/roles/geerlingguy.drupal/README.md
+++ b/provisioning/roles/geerlingguy.drupal/README.md
@@ -37,6 +37,10 @@ Set `drupal_deploy` to `true` and `drupal_build_composer*` to `false` if you wou
   - `dir`: The directory into which the repository will be checked out
   - `accept_hostkey`: Whether to automatically accept the Git server's hostkey on the first connection.
 
+You can also control whether a `composer install` is run after the git clone is finished using the following variable:
+
+    drupal_deploy_composer_install: yes
+
 ### Build a project from a Drush Make file
 
     drupal_build_makefile: false
diff --git a/provisioning/roles/geerlingguy.drupal/defaults/main.yml b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
index defa9e1cd..a114542ea 100644
--- a/provisioning/roles/geerlingguy.drupal/defaults/main.yml
+++ b/provisioning/roles/geerlingguy.drupal/defaults/main.yml
@@ -7,6 +7,7 @@ drupal_deploy_version: master
 drupal_deploy_update: true
 drupal_deploy_dir: "/var/www/drupal"
 drupal_deploy_accept_hostkey: no
+drupal_deploy_composer_install: yes
 
 # Set this to 'true' and 'drupal_build_composer*' to 'false' if you would like
 # to build a Drupal make file with Drush.
diff --git a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
index 4d29b73f9..b6bf53133 100644
--- a/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
+++ b/provisioning/roles/geerlingguy.drupal/tasks/deploy.yml
@@ -28,5 +28,7 @@
   composer:
     command: install
     working_dir: "{{ drupal_deploy_dir }}"
-  when: drupal_deploy_composer_file.stat.exists == true
+  when:
+    - drupal_deploy_composer_file.stat.exists == true
+    - drupal_deploy_composer_install == true
   become: no