diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-12-16 17:54:56 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-02-26 09:14:46 +0000 |
| commit | 4b35eb5e241147fb38cf81a11ba63b6ac7c77f90 (patch) | |
| tree | 99102ce24e1b4e975e842c87c75ce458a04bbab2 /docker/macros.j2 | |
| parent | cfde1d096e615627446c4c23fdd07c4c443373dd (diff) | |
| download | kolla-4b35eb5e241147fb38cf81a11ba63b6ac7c77f90.tar.gz kolla-4b35eb5e241147fb38cf81a11ba63b6ac7c77f90.zip | |
CentOS 8: base and openstack-base images
Adds support to the base and openstack-base images for CentOS 8.
These images have been removed from the list of unbuildable images, and
replaced with all dependent images.
This change also includes backports of a number of other changes related
to the base image:
* CentOS 8: disable repo_gpgcheck for grafana image
(Ice120e8001fd9e8bb37ca4f2df26259cf798ee0e)
* CentOS 8: base image fixes for RabbitMQ, fluentd & InfluxDB
(Ibbb720390ff17e11249a5aa77163c15c0971209a)
Change-Id: I18fba8a5c2f99b700990cbf41c76077a1ec2408a
Partially-Implements: blueprint centos-rhel-8
(cherry picked from commit 3c618a1f6f0beca723e031fbe323b159400ad08f)
Diffstat (limited to 'docker/macros.j2')
| -rw-r--r-- | docker/macros.j2 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/macros.j2 b/docker/macros.j2 index 0e4078ec9..f7d74ec72 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -19,7 +19,11 @@ {# Be Extra vigilant about introducing any extra whitespace at the end of the macro for chaining purposes -#} {% macro rpm_security_update(cleanup) -%} +{% if distro_package_manager == 'dnf' -%} + {{ distro_package_manager }} -y distro-sync --security --sec-severity=Important --sec-severity=Critical +{%- else -%} {{ distro_package_manager }} -y update --security --sec-severity=Important --sec-severity=Critical +{%- endif %} {%- if cleanup %} \ && {{ distro_package_manager }} clean all && rm -rf /var/cache/{{ distro_package_manager }}{% endif -%} {%- endmacro %} |