diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-12-17 13:01:42 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-02-26 09:16:48 +0000 |
| commit | 63d566feaafd0cab6eeac9f88acd6ec7fc66b645 (patch) | |
| tree | 456f87f77a33c633532dcc1065dd632e0ed614ce /docker/keystone | |
| parent | 4b35eb5e241147fb38cf81a11ba63b6ac7c77f90 (diff) | |
| download | kolla-63d566feaafd0cab6eeac9f88acd6ec7fc66b645.tar.gz kolla-63d566feaafd0cab6eeac9f88acd6ec7fc66b645.zip | |
CentOS 8: Update packages in images
* Some further changes for python2 vs python3 packages
* Allow rabbitmq 3.7.*, since a newer erlang is available
* Switch from qemu-img-ev to qemu-img on CentOS 8
* bridge-utils no longer available on CentOS 8
* libvirt-daemon-driver-lxc no longer available on CentOS 8
* Mark some more images buildable for CentOS 8
Depends-On: https://review.opendev.org/709553
Change-Id: Iaf5b68ff6d944ae730ca0b1d5832172c106a6c08
Partially-Implements: blueprint centos-rhel-8
Partially-Implements: blueprint centos-rhel-python-3
(cherry picked from commit 4b4e26262b9e03190c639481fb60a8f4f92c532a)
Diffstat (limited to 'docker/keystone')
| -rw-r--r-- | docker/keystone/keystone-base/Dockerfile.j2 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index 5a4e8eddf..85d0734eb 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -31,6 +31,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% endif %} +{% if distro_package_manager == 'dnf' %} +RUN dnf module enable mod_auth_openidc -y +{% endif %} + {{ macros.install_packages(keystone_base_packages | customizable("packages")) }} RUN mkdir -p /var/www/cgi-bin/keystone \ && cp -a /usr/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \ @@ -76,6 +80,10 @@ RUN mkdir -p /var/www/cgi-bin/keystone \ ] %} {% endif %} +{% if distro_package_manager == 'dnf' %} +RUN dnf module enable mod_auth_openidc -y +{% endif %} + {{ macros.install_packages(keystone_base_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf |