openstack
/
kayobe
Code Issues Proposed changes

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
This commit is contained in:
Stig Telfer 2020-09-30 17:49:27 +01:00 committed by Mark Goddard
parent 7c25fec6ca
commit e5a2818896
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/dnf/tasks/local-mirror.yml
View File

@ -38,9 +38,11 @@
loop: loop:
- epel.repo - epel.repo
- epel-modular.repo - epel-modular.repo
when: dnf_install_epel | bool
- name: Update cache - name: Update cache
dnf: dnf:
name: [] name: []
update_cache: yes update_cache: yes
become: True become: True
when: dnf_install_epel | bool

2
playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2
View File

@ -103,8 +103,6 @@ dnf_custom_repos:
baseurl: http://packages.treasuredata.com/3/redhat/$releasever/$basearch baseurl: http://packages.treasuredata.com/3/redhat/$releasever/$basearch
gpgkey: https://packages.treasuredata.com/GPG-KEY-td-agent gpgkey: https://packages.treasuredata.com/GPG-KEY-td-agent
gpgcheck: yes gpgcheck: yes
# Don't install EPEL repositories.
dnf_install_epel: false
# Enable DNF Automatic. # Enable DNF Automatic.
dnf_automatic_enabled: true dnf_automatic_enabled: true
{% endif %} {% endif %}