CentOS/RHEL: Deprecate EPEL repository setup
EPEL is not required to use RDO. Users can use a different module such as puppet-epel[1] if they really need EPEL for any other purpose. [1] https://github.com/voxpupuli/puppet-epel Change-Id: I9743e2711f64cff8c0636c1556cb1e943413fdad
This commit is contained in:
parent
510fa59002
commit
aa3805bb5e
@ -14,12 +14,6 @@
|
|||||||
# RDO OpenStack repository.
|
# RDO OpenStack repository.
|
||||||
# Defaults to true
|
# Defaults to true
|
||||||
#
|
#
|
||||||
# [*manage_epel*]
|
|
||||||
# (Optional) Whether to create a predefined yumrepo resource for
|
|
||||||
# the EPEL repository. Note EPEL is not required for deploying
|
|
||||||
# OpenStack with RDO.
|
|
||||||
# Defaults to false
|
|
||||||
#
|
|
||||||
# [*repo_hash*]
|
# [*repo_hash*]
|
||||||
# (Optional) A hash of yumrepo resources that will be passed to
|
# (Optional) A hash of yumrepo resources that will be passed to
|
||||||
# create_resource. See examples folder for some useful examples.
|
# create_resource. See examples folder for some useful examples.
|
||||||
@ -69,10 +63,17 @@
|
|||||||
# (Optional) Timeout for package update.
|
# (Optional) Timeout for package update.
|
||||||
# Defaults to 600
|
# Defaults to 600
|
||||||
#
|
#
|
||||||
|
# DEPRECATED PARAMETER
|
||||||
|
#
|
||||||
|
# [*manage_epel*]
|
||||||
|
# (Optional) Whether to create a predefined yumrepo resource for
|
||||||
|
# the EPEL repository. Note EPEL is not required for deploying
|
||||||
|
# OpenStack with RDO.
|
||||||
|
# Defaults to false
|
||||||
|
#
|
||||||
class openstack_extras::repo::redhat::redhat (
|
class openstack_extras::repo::redhat::redhat (
|
||||||
String[1] $release = 'bobcat',
|
String[1] $release = 'bobcat',
|
||||||
Boolean $manage_rdo = true,
|
Boolean $manage_rdo = true,
|
||||||
Boolean $manage_epel = false,
|
|
||||||
Hash $repo_hash = {},
|
Hash $repo_hash = {},
|
||||||
Hash $repo_source_hash = {},
|
Hash $repo_source_hash = {},
|
||||||
Boolean $repo_replace = true,
|
Boolean $repo_replace = true,
|
||||||
@ -84,6 +85,8 @@ class openstack_extras::repo::redhat::redhat (
|
|||||||
String[1] $centos_mirror_url = 'http://mirror.stream.centos.org',
|
String[1] $centos_mirror_url = 'http://mirror.stream.centos.org',
|
||||||
Boolean $update_packages = false,
|
Boolean $update_packages = false,
|
||||||
Integer[0] $update_timeout = 600,
|
Integer[0] $update_timeout = 600,
|
||||||
|
# DEPRECATED PARAMETERS
|
||||||
|
Boolean $manage_epel = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
validate_yum_hash($repo_hash)
|
validate_yum_hash($repo_hash)
|
||||||
@ -130,6 +133,8 @@ class openstack_extras::repo::redhat::redhat (
|
|||||||
}
|
}
|
||||||
|
|
||||||
if $manage_epel {
|
if $manage_epel {
|
||||||
|
warning('The manage_epel parameter has been deprecated and will be removed in a future release')
|
||||||
|
|
||||||
$epel_hash = {
|
$epel_hash = {
|
||||||
'epel' => {
|
'epel' => {
|
||||||
'metalink' => "https://mirrors.fedoraproject.org/metalink?repo=epel-${facts['os']['release']['major']}&arch=\$basearch",
|
'metalink' => "https://mirrors.fedoraproject.org/metalink?repo=epel-${facts['os']['release']['major']}&arch=\$basearch",
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
The ``openstack_extras::repo::redhat::redhat::manage_epel`` parameter has
|
||||||
|
been deprecated and will be removed in a future release.
|
Loading…
x
Reference in New Issue
Block a user