Disable EPEL by default

EPEL is no longer required for a default installation. Let's disable it.

Also clean up the install_epel variable from Kolla Ansible globals.yml
template, since it never existed.

Story: 2009757
Task: 44227

Change-Id: I96eb4685f997e85ad2ee5318640d58d0287a016d
This commit is contained in:
Mark Goddard 2021-12-22 18:08:42 +00:00
parent 719968f694
commit e0dec91689
10 changed files with 31 additions and 15 deletions

View File

@ -33,8 +33,8 @@ dnf_epel_mirror_directory: 'pub/epel'
dnf_custom_repos: {}
# Whether to install the epel-release package. This affects RedHat-based
# systems only. Default value is 'true'.
dnf_install_epel: true
# systems only. Default value is 'false'.
dnf_install_epel: false
###############################################################################
# DNF Automatic configuration.

View File

@ -32,4 +32,4 @@ dnf_epel_mirror_directory: 'pub/epel'
dnf_custom_repos: {}
# Whether to install the epel-release package.
dnf_install_epel: true
dnf_install_epel: false

View File

@ -30,7 +30,7 @@ kolla_ansible_target_venv:
kolla_upper_constraints_file:
# Whether to install the epel-release package.
kolla_ansible_install_epel: true
kolla_ansible_install_epel: false
# Password to use to encrypt the passwords.yml file.
kolla_ansible_vault_password:

View File

@ -527,8 +527,6 @@ grafana_admin_username: "{{ grafana_local_admin_user_name }}"
selinux_state: {{ kolla_selinux_state }}
{% endif %}
install_epel: {{ kolla_ansible_install_epel | bool }}
{% if kolla_enable_host_ntp is not none %}
enable_host_ntp: {{ kolla_enable_host_ntp | bool }}
{% endif %}

View File

@ -20,7 +20,7 @@ kolla_venv: "{{ ansible_facts.env['PWD'] }}/kolla-venv"
kolla_upper_constraints_file:
# Whether to install the epel-release package.
kolla_install_epel: true
kolla_install_epel: false
# Directory where Kolla config files will be installed.
kolla_build_config_path:

View File

@ -276,11 +276,18 @@ For example, the following configuration defines a single DNF repository called
gpgkey: http://example.com/gpgkey
gpgcheck: yes
Disabling EPEL
--------------
Enabling or disabling EPEL
--------------------------
It is possible to disable the EPEL DNF repository by setting
``dnf_install_epel`` to ``false``.
Prior to the Yoga release, the EPEL DNF repository was enabled by default
(``dnf_install_epel: true``). Since Yoga, it is disabled by default
(``dnf_install_epel: false``).
Previously, EPEL was required to install some packages such as ``python-pip``,
however this is no longer the case.
It is possible to enable or disable the EPEL DNF repository by setting
``dnf_install_epel`` to ``true`` or ``false`` respectively.
DNF Automatic
-------------

View File

@ -38,7 +38,7 @@
#dnf_custom_repos:
# Whether to install the epel-release package. This affects RedHat-based
# systems only. Default value is 'true'.
# systems only. Default value is 'false'.
#dnf_install_epel:
###############################################################################

View File

@ -124,6 +124,8 @@ dnf_custom_repos:
baseurl: http://packages.treasuredata.com/4/redhat/$releasever/$basearch
gpgkey: https://packages.treasuredata.com/GPG-KEY-td-agent
gpgcheck: yes
# Install EPEL local mirror.
dnf_install_epel: true
# Enable DNF Automatic.
dnf_automatic_enabled: true
{% endif %}

View File

@ -0,0 +1,9 @@
---
upgrade:
- |
The default value of ``dnf_install_epel`` has been changed to ``false``.
This means that the EPEL DNF repository is no longer installed by default.
Neither existing EPEL repositories nor the ``epel-release`` package will be
removed. If necessary, EPEL may be enabled by setting ``dnf_install_epel``
to ``true`` in ``dnf.yml``. See `story 2009757
<https://storyboard.openstack.org/#!/story/2009757>`__ for details.

View File

@ -8,14 +8,14 @@
- block:
# NOTE(mgoddard): The CentOS image used in CI has epel-release installed,
# but the configure-mirrors role used by Zuul disables epel. Since we
# install epel-release and expect epel to be enabled, enable it here.
# but the configure-mirrors role used by Zuul disables epel. We no longer
# install EPEL by default, but let's just be sure it's disabled.
- name: Ensure dnf-plugins-core is installed
package:
name: dnf-plugins-core
state: present
- name: Enable the EPEL repository
command: dnf config-manager --enable epel
command: dnf config-manager --disable epel
when: ansible_os_family == 'RedHat'
become: true