From 6319bc6f559ab5c49a7ad701b606b58af62337b0 Mon Sep 17 00:00:00 2001
From: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Date: Mon, 10 Aug 2020 21:14:07 +0200
Subject: Remove weird deps

This is a follow-up on "Refactor httpd install to base image"
[1].

It seems a copy-paste algorithm was used to craft Dockerfiles
for some httpd-enabled services which resulted in an abundance of
ldappool packages getting installed, even in the 'source' case.
This seems to have also kept ldappool at a lower version because
it did not get updated via pip later.
This patch deals with that and also moves ldap deps for Keystone
to their proper place in 'source' case (extras).
Note Keystone client gets installed in openstack-base.

Cinder does not need to include Keystone either.

[1] https://review.opendev.org/744037

Change-Id: I017d7a6a5d2b1ae6c04556dcf172453a36de5be7
---
 docker/keystone/keystone-base/Dockerfile.j2 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'docker/keystone')

diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2
index f3b4c2d0b..2176db3e1 100644
--- a/docker/keystone/keystone-base/Dockerfile.j2
+++ b/docker/keystone/keystone-base/Dockerfile.j2
@@ -15,7 +15,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'mod_auth_mellon',
             'mod_auth_openidc',
             'openstack-keystone',
-            'python3-keystoneclient',
             'python3-ldappool'
         ] %}
 
@@ -44,9 +43,10 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
 {% elif install_type == 'source' %}
     {% if base_package_type == 'rpm' %}
         {% set keystone_base_packages = [
+            'cyrus-sasl-devel',
             'mod_auth_mellon',
             'mod_auth_openidc',
-            'python3-ldappool'
+            'openldap-devel',
         ] %}
 
 RUN dnf module enable mod_auth_openidc -y
@@ -56,7 +56,8 @@ RUN dnf module enable mod_auth_openidc -y
         {% set keystone_base_packages = [
             'libapache2-mod-auth-mellon',
             'libapache2-mod-auth-openidc',
-            'python3-ldappool'
+            'libldap2-dev',
+            'libsasl2-dev',
         ] %}
 {{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
     {% endif %}
@@ -65,7 +66,7 @@ RUN dnf module enable mod_auth_openidc -y
 ADD keystone-base-archive /keystone-base-source
 
 {% set keystone_base_pip_packages = [
-    '/keystone'
+    '/keystone[ldap]',
 ] %}
 
 RUN ln -s keystone-base-source/* keystone \
-- 
cgit v1.2.3