From 0914b24f3ccfbacab0c19ceec789313a6b6d579f Mon Sep 17 00:00:00 2001 From: Rosie Le Faive Date: Fri, 5 Jan 2024 15:57:09 -0400 Subject: [PATCH] Add ansible_user and don't separately install drush. --- Vagrantfile | 3 ++- requirements.yml | 3 --- webserver.yml | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 25784b85..ac7ff9b7 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -75,7 +75,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| ansible.host_vars = { "all" => { "ansible_ssh_user" => $vagrantUser } } - ansible.extra_vars = { "islandora_distro" => $vagrantBox, + ansible.extra_vars = { "ansible_user" => $vagrantUser, + "islandora_distro" => $vagrantBox, "islandora_profile" => $drupalProfile, "islandora_build_base_box" => $buildBaseBox } end diff --git a/requirements.yml b/requirements.yml index 6abe9a9e..e1d5882a 100644 --- a/requirements.yml +++ b/requirements.yml @@ -37,6 +37,3 @@ - src: geerlingguy.drupal version: 4.3.0 -- src: geerlingguy.drush - version: 3.1.1 - diff --git a/webserver.yml b/webserver.yml index d4bfa15f..3a40c1a1 100644 --- a/webserver.yml +++ b/webserver.yml @@ -21,8 +21,6 @@ when: islandora_build_base_box|bool == True - name: geerlingguy.composer when: islandora_build_base_box|bool == True - - name: geerlingguy.drush # Include drush as drupal-openseadragon needs it. - when: islandora_build_base_box|bool == False - name: geerlingguy.drupal when: islandora_build_base_box|bool == False