From 107ca8ea088354524f71fa36bcd52952510b6feb Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Mon, 21 May 2018 15:14:06 +0300 Subject: Enable packages for kerberos authentication for keystone This adds the packages required to do kerberos authentication with keystone. Change-Id: I9ef972ea5a8e9cf4d1ed43ef27203576d9382822 --- docker/keystone/keystone/Dockerfile.j2 | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) (limited to 'docker/keystone') diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index 073cf7c6e..64eb57238 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -9,11 +9,36 @@ 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 == 'source' %} +{% if install_type == 'binary' %} + # TODO: oraclelinux fails to install these packages. Should be added when this is fixed. + {% if base_distro in ['centos', 'rhel'] %} + {% set keystone_packages = [ + 'mod_auth_kerb', + 'python-requests-kerberos', + ] %} + {% elif base_distro in ['debian', 'ubuntu'] %} + {% set keystone_packages = [ + 'libapache2-mod-auth-kerb', + 'python-requests-kerberos', + ] %} + {% endif %} +{{ macros.install_packages(keystone_packages | customizable("packages")) }} +{% elif install_type == 'source' %} + {% if base_distro in ['centos', 'rhel'] %} + {% set keystone_packages = [ + 'mod_auth_kerb', + ] %} + {% elif base_distro in ['debian', 'ubuntu'] %} + {% set keystone_packages = [ + 'libapache2-mod-auth-kerb', + ] %} + {% endif %} +{{ macros.install_packages(keystone_packages | customizable("packages")) }} ADD plugins-archive / {% set keystone_plugins_pip_packages = [ - '/plugins/*' + '/plugins/*', + 'requests-kerberos', ] %} RUN if [ "$(ls /plugins)" ]; then \ -- cgit v1.2.3