aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2024-08-29 08:19:04 +0200
committerMichal Nasiadka <mnasiadka@gmail.com>2024-08-29 08:20:56 +0200
commit082d90cca02b0e3935363c7ce2e7ae718bcbb789 (patch)
treefe8c74fbae33f5e4489b9f01953af917004c4746 /docker
parent779a9a33f4c1f26b81b8e3e9c00b73318435b1fd (diff)
downloadkolla-082d90cca02b0e3935363c7ce2e7ae718bcbb789.tar.gz
kolla-082d90cca02b0e3935363c7ce2e7ae718bcbb789.zip
keystone: Fix requests-kerberos installation
Since it was bundled with plugins installation, and we did not have any plugins in keystone container - it was not installed at all. Adding in libkrb5 dependencies for requests-kerberos. Closes-Bug: #2078305 Change-Id: I51c69d0673280e351daa410d943f769d33a10d6c
Diffstat (limited to 'docker')
-rw-r--r--docker/keystone/keystone/Dockerfile.j210
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