diff options
| author | Zuul <zuul@review.openstack.org> | 2018-05-24 11:28:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-05-24 11:28:09 +0000 |
| commit | 380be0cb3e3d175d6a930d5e6d3abf90f27bd0c6 (patch) | |
| tree | d7a7aca7897bb321dce4cbf271ac017b749e9fc6 /docker | |
| parent | dfe78ffc96930237549fb3a42b88abdde35711b8 (diff) | |
| parent | 107ca8ea088354524f71fa36bcd52952510b6feb (diff) | |
| download | kolla-380be0cb3e3d175d6a930d5e6d3abf90f27bd0c6.tar.gz kolla-380be0cb3e3d175d6a930d5e6d3abf90f27bd0c6.zip | |
Merge "Enable packages for kerberos authentication for keystone"
Diffstat (limited to 'docker')
| -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 \ |