From e5a2818896a47c902487ea9aa97b5a4a03f2b9d6 Mon Sep 17 00:00:00 2001
From: Stig Telfer <stig.openstack@telfer.org>
Date: Wed, 30 Sep 2020 17:49:27 +0100
Subject: [PATCH] When EPEL install flag is not set

The flag dnf_install_epel was being used to predicate installation
of the EPEL RPM repo package, but not preventing the installation
of configuration for access to EPEL.  This small patch completes
the job.

Updates the overcloud host configure CI job to install EPEL mirrors,
since it was previously relying on this buggy behaviour.

Change-Id: Ib417837d0772338b16ea9f7f2540549f277d5de8
---
 ansible/roles/dnf/tasks/local-mirror.yml                        | 2 ++
 playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2 | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/dnf/tasks/local-mirror.yml b/ansible/roles/dnf/tasks/local-mirror.yml
index 405b5c83a..afc636390 100644
--- a/ansible/roles/dnf/tasks/local-mirror.yml
+++ b/ansible/roles/dnf/tasks/local-mirror.yml
@@ -38,9 +38,11 @@
   loop:
     - epel.repo
     - epel-modular.repo
+  when: dnf_install_epel | bool
 
 - name: Update cache
   dnf:
     name: []
     update_cache: yes
   become: True
+  when: dnf_install_epel | bool
diff --git a/playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2
index 057d8e8bd..7ffe1ef65 100644
--- a/playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2
+++ b/playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2
@@ -103,8 +103,6 @@ dnf_custom_repos:
     baseurl: http://packages.treasuredata.com/3/redhat/$releasever/$basearch
     gpgkey: https://packages.treasuredata.com/GPG-KEY-td-agent
     gpgcheck: yes
-# Don't install EPEL repositories.
-dnf_install_epel: false
 # Enable DNF Automatic.
 dnf_automatic_enabled: true
 {% endif %}