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
This commit is contained in:
parent
779a9a33f4
commit
082d90cca0
@ -9,19 +9,27 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
|
|
||||||
{% if base_package_type == 'rpm' %}
|
{% if base_package_type == 'rpm' %}
|
||||||
{% set keystone_packages = [
|
{% set keystone_packages = [
|
||||||
|
'krb5-devel',
|
||||||
'mod_auth_gssapi',
|
'mod_auth_gssapi',
|
||||||
] %}
|
] %}
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
{% set keystone_packages = [
|
{% set keystone_packages = [
|
||||||
'libapache2-mod-auth-gssapi',
|
'libapache2-mod-auth-gssapi',
|
||||||
|
'libkrb5-dev',
|
||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ macros.install_packages(keystone_packages | customizable("packages")) }}
|
{{ 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 /
|
ADD plugins-archive /
|
||||||
|
|
||||||
{% set keystone_plugins_pip_packages = [
|
{% set keystone_plugins_pip_packages = [
|
||||||
'/plugins/*',
|
'/plugins/*',
|
||||||
'requests-kerberos',
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap
|
COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap
|
||||||
|
Loading…
Reference in New Issue
Block a user