diff options
| author | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2018-05-21 15:14:06 +0300 |
|---|---|---|
| committer | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2018-05-23 09:41:52 +0000 |
| commit | 107ca8ea088354524f71fa36bcd52952510b6feb (patch) | |
| tree | d3efa2daff20d5a05d017675cb878d09710a7c6f | |
| parent | 0df99d5f188d194cbf5f584938d277aec5919cb2 (diff) | |
| download | kolla-107ca8ea088354524f71fa36bcd52952510b6feb.tar.gz kolla-107ca8ea088354524f71fa36bcd52952510b6feb.zip | |
Enable packages for kerberos authentication for keystone
This adds the packages required to do kerberos authentication with
keystone.
Change-Id: I9ef972ea5a8e9cf4d1ed43ef27203576d9382822
| -rw-r--r-- | docker/keystone/keystone/Dockerfile.j2 | 29 |
1 files changed, 27 insertions, 2 deletions
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 \ |