From 10caba874b3a3675779382835bfb4df9e2466264 Mon Sep 17 00:00:00 2001
From: Erik Berg <openstack@slipsprogrammor.no>
Date: Fri, 14 Oct 2022 19:01:28 +0200
Subject: [PATCH] Install passlib to venv (htpasswd)

The ansible htpasswd module requires [1] passlib, remove unnecessary
system package dependencies.

[1] https://docs.ansible.com/ansible/latest/collections/community/general/htpasswd_module.html#requirements

Change-Id: I23f78e6e70f810ec2d8db5200ba918e3c9dfb224
---
 .../required_defaults_Debian_family.yml         |  1 -
 .../required_defaults_RedHat_family.yml         |  1 -
 .../bifrost-ironic-install/tasks/install.yml    | 17 ++++++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml
index 41eab5460..8c9392319 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_Debian_family.yml
@@ -31,7 +31,6 @@ required_packages:
   - socat
   - gcc
   - dnsmasq
-  - apache2-utils
   - isolinux
   - dosfstools
 # NOTE(TheJulia): The above entry for dnsmasq must be the last entry in the
diff --git a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml
index 368428edf..52f0d2b53 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/required_defaults_RedHat_family.yml
@@ -33,6 +33,5 @@ required_packages:
   - socat
   - firewalld
   - python3-firewall
-  - httpd-tools
   - syslinux-nonlinux
   - dosfstools
diff --git a/playbooks/roles/bifrost-ironic-install/tasks/install.yml b/playbooks/roles/bifrost-ironic-install/tasks/install.yml
index afc43e1fc..6c6696214 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/install.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/install.yml
@@ -39,11 +39,20 @@
   - ansible_distribution == "CentOS"
   - ansible_distribution_version|int >= 9
 
-- name: "Install packages"
+- name: "Install system packages"
   package:
     name: "{{ required_packages }}"
     state: present
 
+- name: "Install python packages (in venv)"
+  include_role:
+    name: bifrost-pip-install
+  vars:
+    package: "{{ item }}"
+  with_items:
+    - passlib
+    - pymysql
+
 - name: "Install Nginx"
   import_role:
     name: bifrost-nginx-install
@@ -120,12 +129,6 @@
     package: metalsmith
     source_install: false
 
-- name: "Install pymysql"
-  include_role:
-    name: bifrost-pip-install
-  vars:
-    package: pymysql
-
 - name: "Install extra packages for ironic"
   include_role:
     name: bifrost-pip-install