diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-09-18 12:40:59 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-09-18 13:42:47 +0100 |
| commit | fa8e174be6bc5b4d555258197938da9da40bfa81 (patch) | |
| tree | e032e8a421baa675a6188f1ba1a07616ba8193b9 /docker/keystone | |
| parent | 1c86301f286cb7f90097496caec3ebf62a1f0d22 (diff) | |
| download | kolla-fa8e174be6bc5b4d555258197938da9da40bfa81.tar.gz kolla-fa8e174be6bc5b4d555258197938da9da40bfa81.zip | |
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
Diffstat (limited to 'docker/keystone')
| -rw-r--r-- | docker/keystone/keystone/Dockerfile.j2 | 5 |
1 files changed, 2 insertions, 3 deletions
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', ] %} |