From dcfbf7fbe5e6c7883b40da2765eb37f7ca9804ac Mon Sep 17 00:00:00 2001
From: Alex-Welsh <alex@stackhpc.com>
Date: Fri, 13 Dec 2024 17:01:46 +0000
Subject: [PATCH] Misc minor fixes

---
 etc/kayobe/ansible/fix-grub-rl9.yml             | 2 +-
 etc/kayobe/ansible/stackhpc-openstack-tests.yml | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/etc/kayobe/ansible/fix-grub-rl9.yml b/etc/kayobe/ansible/fix-grub-rl9.yml
index 3a9a7e1d7..6d81f137d 100644
--- a/etc/kayobe/ansible/fix-grub-rl9.yml
+++ b/etc/kayobe/ansible/fix-grub-rl9.yml
@@ -19,4 +19,4 @@
             path: /boot/efi/EFI/rocky/grub.cfg
             regexp: --root-dev-only\s?
             replace: ""
-            when: stat_result.stat.exists
+          when: stat_result.stat.exists
diff --git a/etc/kayobe/ansible/stackhpc-openstack-tests.yml b/etc/kayobe/ansible/stackhpc-openstack-tests.yml
index 3094c3d4e..0af91e79f 100644
--- a/etc/kayobe/ansible/stackhpc-openstack-tests.yml
+++ b/etc/kayobe/ansible/stackhpc-openstack-tests.yml
@@ -42,15 +42,19 @@
             - { name: pip }
             - { name: setuptools }
 
-        - name: Ensure required Python packages are installed
+        - name: Ensure required individual Python packages are installed
           ansible.builtin.pip:
             name:
               - "{{ repo_tmpdir.path }}"
-              - "-r {{ repo_tmpdir.path }}/requirements.txt"
               - pytest-html
               - pytest-timeout
             virtualenv: "{{ sot_venv }}"
 
+        - name: Ensure Python requirements file packages are installed
+          ansible.builtin.pip:
+            requirements: "{{ repo_tmpdir.path }}/requirements.txt"
+            virtualenv: "{{ sot_venv }}"
+
         - name: Include Kolla Ansible passwords
           ansible.builtin.include_vars:
             file: "{{ kayobe_env_config_path }}/kolla/passwords.yml"