docker: drop binary parts

Big patch drops all mentions of binary images support. Suggestions are
welcome how to split it into parts or handle better.

Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3

2 files changed, 24 insertions, 75 deletions

diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2
index 2176db3e1..fc5f814a2 100644
--- a/docker/keystone/keystone-base/Dockerfile.j2
+++ b/docker/keystone/keystone-base/Dockerfile.j2
@@ -9,58 +9,25 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='keystone') }}
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set keystone_base_packages = [
-            'mod_auth_mellon',
-            'mod_auth_openidc',
-            'openstack-keystone',
-            'python3-ldappool'
-        ] %}
+{% if base_package_type == 'rpm' %}
+    {% set keystone_base_packages = [
+        'cyrus-sasl-devel',
+        'mod_auth_mellon',
+        'mod_auth_openidc',
+        'openldap-devel',
+    ] %}
 
 RUN dnf module enable mod_auth_openidc -y
 
+{% elif base_package_type == 'deb' %}
+    {% set keystone_base_packages = [
+        'libapache2-mod-auth-mellon',
+        'libapache2-mod-auth-openidc',
+        'libldap2-dev',
+        'libsasl2-dev',
+    ] %}
+{% endif %}
 {{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/keystone \
-    && cp -a /usr/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
-    && cp -a /usr/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin
-
-    {% elif base_package_type == 'deb' %}
-        {% set keystone_base_packages = [
-            'keystone',
-            'libapache2-mod-auth-mellon',
-            'libapache2-mod-auth-openidc',
-            'python3-ldappool'
-        ] %}
-
-{{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/keystone \
-    && cp -a /usr/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
-    && cp -a /usr/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
-    && rm -f /etc/apache2/sites-enabled/keystone.conf
-
-    {% endif %}
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-        {% set keystone_base_packages = [
-            'cyrus-sasl-devel',
-            'mod_auth_mellon',
-            'mod_auth_openidc',
-            'openldap-devel',
-        ] %}
-
-RUN dnf module enable mod_auth_openidc -y
-
-{{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
-    {% elif base_package_type == 'deb' %}
-        {% set keystone_base_packages = [
-            'libapache2-mod-auth-mellon',
-            'libapache2-mod-auth-openidc',
-            'libldap2-dev',
-            'libsasl2-dev',
-        ] %}
-{{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
-    {% endif %}
 
 {% block keystone_source_install %}
 ADD keystone-base-archive /keystone-base-source
@@ -78,8 +45,6 @@ RUN ln -s keystone-base-source/* keystone \
     && chown -R keystone: /etc/keystone /var/www/cgi-bin/keystone
 {% endblock %}
 
-{% endif %}
-
 RUN chown -R keystone: /var/www/cgi-bin/keystone \
     && chmod 755 /var/www/cgi-bin/keystone/*
 
diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2
index 763d78d25..3c8df2e75 100644
--- a/docker/keystone/keystone/Dockerfile.j2
+++ b/docker/keystone/keystone/Dockerfile.j2
@@ -11,29 +11,15 @@ COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap
 
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'rpm' %}
-        {% set keystone_packages = [
-            'mod_auth_gssapi',
-            'python3-requests-kerberos'
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set keystone_packages = [
-            'libapache2-mod-auth-gssapi',
-            'python3-requests-kerberos',
-        ] %}
-    {% endif %}
-{{ macros.install_packages(keystone_packages | customizable("packages")) }}
-{% elif install_type == 'source' %}
-    {% if base_package_type == 'rpm' %}
-        {% set keystone_packages = [
-            'mod_auth_gssapi',
-        ] %}
-    {% elif base_package_type == 'deb' %}
-        {% set keystone_packages = [
-            'libapache2-mod-auth-gssapi',
-        ] %}
-    {% endif %}
+{% if base_package_type == 'rpm' %}
+    {% set keystone_packages = [
+        'mod_auth_gssapi',
+    ] %}
+{% elif base_package_type == 'deb' %}
+    {% set keystone_packages = [
+        'libapache2-mod-auth-gssapi',
+    ] %}
+{% endif %}
 {{ macros.install_packages(keystone_packages | customizable("packages")) }}
 ADD plugins-archive /
 
@@ -46,7 +32,5 @@ RUN if [ "$(ls /plugins)" ]; then \
         {{ macros.install_pip(keystone_plugins_pip_packages) }}; \
     fi
 
-{% endif %}
-
 {% block keystone_footer %}{% endblock %}
 {% block footer %}{% endblock %}