diff options
| author | Zuul <zuul@review.opendev.org> | 2024-09-03 05:51:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-09-03 05:51:49 +0000 |
| commit | 1fb183ad988a48665501e34001146636241addb3 (patch) | |
| tree | bb671e09bef09a480efd9933a9dbc2083755c942 /docker | |
| parent | 57dd38f365fd7dcd48aab66c219f562a8a1cafc6 (diff) | |
| parent | 082d90cca02b0e3935363c7ce2e7ae718bcbb789 (diff) | |
| download | kolla-1fb183ad988a48665501e34001146636241addb3.tar.gz kolla-1fb183ad988a48665501e34001146636241addb3.zip | |
Merge "keystone: Fix requests-kerberos installation"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/keystone/keystone/Dockerfile.j2 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index 6f7f7d6ec..97393fef8 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -9,19 +9,27 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set keystone_packages = [ + 'krb5-devel', 'mod_auth_gssapi', ] %} {% elif base_package_type == 'deb' %} {% set keystone_packages = [ 'libapache2-mod-auth-gssapi', + 'libkrb5-dev', ] %} {% endif %} {{ macros.install_packages(keystone_packages | customizable("packages")) }} + +{% set keystone_pip_packages = [ + 'requests-kerberos', +] %} + +RUN {{ macros.install_pip(keystone_pip_packages | customizable("pip_packages")) }} + ADD plugins-archive / {% set keystone_plugins_pip_packages = [ '/plugins/*', - 'requests-kerberos', ] %} COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap |
