diff options
Diffstat (limited to 'docker/keystone')
| -rw-r--r-- | docker/keystone/keystone-base/Dockerfile.j2 | 26 | ||||
| -rw-r--r-- | docker/keystone/keystone-ssh/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/keystone/keystone/Dockerfile.j2 | 11 |
3 files changed, 2 insertions, 37 deletions
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index 6792ff3c5..194480191 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -16,26 +16,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'mod_auth_mellon', 'mod_auth_openidc', 'mod_ssl', - 'openstack-keystone' - ] %} - - {% if distro_python_version.startswith('3') %} - {% set keystone_base_packages = keystone_base_packages + [ + 'openstack-keystone', 'python3-keystoneclient', 'python3-ldappool', 'python3-mod_wsgi' ] %} - {% else %} - {% set keystone_base_packages = keystone_base_packages + [ - 'mod_wsgi', - 'python-keystoneclient', - 'python2-ldappool' - ] %} - {% endif %} -{% if distro_package_manager == 'dnf' %} RUN dnf module enable mod_auth_openidc -y -{% endif %} {{ macros.install_packages(keystone_base_packages | customizable("packages")) }} RUN mkdir -p /var/www/cgi-bin/keystone \ @@ -69,22 +56,11 @@ RUN mkdir -p /var/www/cgi-bin/keystone \ 'mod_auth_mellon', 'mod_auth_openidc', 'mod_ssl', - ] %} - {% if distro_python_version.startswith('3') %} - {% set keystone_base_packages = keystone_base_packages + [ 'python3-ldappool', 'python3-mod_wsgi' ] %} - {% else %} - {% set keystone_base_packages = keystone_base_packages + [ - 'mod_wsgi', - 'python2-ldappool' - ] %} - {% endif %} -{% if distro_package_manager == 'dnf' %} RUN dnf module enable mod_auth_openidc -y -{% endif %} {{ macros.install_packages(keystone_base_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2 index cfda95319..770832991 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/docker/keystone/keystone-ssh/Dockerfile.j2 @@ -15,11 +15,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'rsync' ] %} -{% if distro_package_manager == 'dnf' %} # NOTE(mgoddard): The centos:8 image contains a /run/nologin file, which # prevents SSH access to it. RUN rm -f /run/nologin -{% endif %} {% elif base_package_type == 'deb' %} {% set keystone_ssh_packages = [ diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index 95096f59d..763d78d25 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -14,18 +14,9 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bo {% if install_type == 'binary' %} {% if base_package_type == 'rpm' %} {% set keystone_packages = [ - 'mod_auth_gssapi' - ] %} - - {% if distro_python_version.startswith('3') %} - {% set keystone_packages = keystone_packages + [ + 'mod_auth_gssapi', 'python3-requests-kerberos' ] %} - {% else %} - {% set keystone_packages = keystone_packages + [ - 'python-requests-kerberos' - ] %} - {% endif %} {% elif base_package_type == 'deb' %} {% set keystone_packages = [ 'libapache2-mod-auth-gssapi', |