From 788978211326093e10795c611971ca8911e2a986 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Mon, 16 Mar 2020 15:16:31 +0000
Subject: CentOS 8: Switch last mentions of yum to dnf

Change-Id: I31e9742793cfb1abff9749083c9ce86000dae1af
Partially-Implements: blueprint centos-rhel-8
---
 docker/base/Dockerfile.j2 | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docker/base')

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index a0a0ffebe..07dcc9461 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -51,10 +51,12 @@ RUN CURRENT_DISTRO_RELEASE=$(awk '{match($0, /[0-9]+/,version)}END{print version
     && cat /tmp/kolla_bashrc >> /etc/bashrc \
     && sed -i 's|^\(override_install_langs=.*\)|# \1|' /etc/dnf/dnf.conf
 
+{% block base_dnf_conf %}
 {% block base_yum_conf %}
 
 COPY dnf.conf /etc/dnf/dnf.conf
 
+{% endblock %}
 {% endblock %}
 
 # Install what is needed for en_US.UTF-8
-- 
cgit v1.2.3