diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-18 18:11:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-18 18:11:30 +0000 |
| commit | 827dcbc7df6ea426c0cd1841589db57cd65a46d6 (patch) | |
| tree | 7adefc6544371a8bd7e7da372b37a99ccfbbdd7b /docker/keystone | |
| parent | 2241efb2eb61361c9291fd137250cb5e7719384d (diff) | |
| parent | fa8e174be6bc5b4d555258197938da9da40bfa81 (diff) | |
| download | kolla-827dcbc7df6ea426c0cd1841589db57cd65a46d6.tar.gz kolla-827dcbc7df6ea426c0cd1841589db57cd65a46d6.zip | |
Merge "Remove support for OracleLinux"
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', ] %} |