From fa8e174be6bc5b4d555258197938da9da40bfa81 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 18 Sep 2019 12:40:59 +0100 Subject: Remove support for OracleLinux We have agreed to remove support for Oracle Linux. http://lists.openstack.org/pipermail/openstack-discuss/2019-June/006896.html Change-Id: I961dfba1aeef2c509ecdaf376dfe6928926ffb39 Depends-On: https://review.opendev.org/682858 --- docker/keystone/keystone/Dockerfile.j2 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'docker/keystone') diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index f38722769..62a92dcb9 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -10,8 +10,7 @@ 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 == 'binary' %} - # TODO: oraclelinux fails to install these packages. Should be added when this is fixed. - {% if base_package_type == 'rpm' and base_distro != 'oraclelinux' %} + {% if base_package_type == 'rpm' %} {% set keystone_packages = [ 'mod_auth_gssapi' ] %} @@ -33,7 +32,7 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bo {% endif %} {{ macros.install_packages(keystone_packages | customizable("packages")) }} {% elif install_type == 'source' %} - {% if base_package_type == 'rpm' and base_distro != 'oraclelinux' %} + {% if base_package_type == 'rpm' %} {% set keystone_packages = [ 'mod_auth_gssapi', ] %} -- cgit v1.2.3