From df05a8b793b8fc9e505561884cb51216517d4339 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Thu, 24 May 2018 14:52:35 +0300 Subject: keystone: Switch from mod_auth_kerb to mod_auth_gssapi The packages needed for authentication using kerberos for keystone landed in a recent patch [1]. Unfortunately, shortly after the patch merging I was informed that the preferred module is mod_auth_gssapi nowadays (given that there is a planned deprecation for mod_auth_kerb). [1] I9ef972ea5a8e9cf4d1ed43ef27203576d9382822 Change-Id: I5f1aa4a959fd91b164a697e98e253fcab0fc1572 --- docker/keystone/keystone/Dockerfile.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docker') diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index 64eb57238..481892e81 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -13,12 +13,12 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bo # 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', + 'mod_auth_gssapi', 'python-requests-kerberos', ] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set keystone_packages = [ - 'libapache2-mod-auth-kerb', + 'libapache2-mod-auth-gssapi', 'python-requests-kerberos', ] %} {% endif %} @@ -26,11 +26,11 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bo {% elif install_type == 'source' %} {% if base_distro in ['centos', 'rhel'] %} {% set keystone_packages = [ - 'mod_auth_kerb', + 'mod_auth_gssapi', ] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set keystone_packages = [ - 'libapache2-mod-auth-kerb', + 'libapache2-mod-auth-gssapi', ] %} {% endif %} {{ macros.install_packages(keystone_packages | customizable("packages")) }} -- cgit v1.2.3