Add ansible_user and don't separately install drush. (#271)

Islandora-Devops · Jan 18, 2024 · eaf133e · eaf133e
1 parent 3b9d1c5
commit eaf133e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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