Skip to content

Commit ae7df2d

Browse files
authored
Merge pull request #456 from sircubbi/bugfix_el8_repo
Disable failovermethod in yumrepo on EL8
2 parents 8645e91 + 0ab4d50 commit ae7df2d

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

.fixtures.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
fixtures:
22
repositories:
3-
"stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
4-
"apt": "git://github.com/puppetlabs/puppetlabs-apt.git"
5-
"portage": "git://github.com/gentoo/puppet-portage.git"
6-
"chocolatey": "git://github.com/puppetlabs/puppetlabs-chocolatey.git"
3+
"stdlib": "https://github.com/puppetlabs/puppetlabs-stdlib.git"
4+
"apt": "https://github.com/puppetlabs/puppetlabs-apt.git"
5+
"portage": "https://github.com/gentoo/puppet-portage.git"
6+
"chocolatey": "https://github.com/puppetlabs/puppetlabs-chocolatey.git"
77
yumrepo_core:
88
repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
99
puppet_version: ">= 6.0.0"

manifests/repo/nodesource/yum.pp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
default => '0',
1717
}
1818

19+
$yum_failovermethod = (versioncmp($facts['os']['release']['major'], '8') >= 0 and $priority == 'absent') ? {
20+
true => 'absent',
21+
default => 'priority',
22+
}
23+
1924
if ($ensure == 'present') {
2025
if $facts['os']['release']['major'] == '8' {
2126
file { 'dnf_module':
@@ -32,7 +37,7 @@
3237
descr => $descr,
3338
baseurl => $baseurl,
3439
enabled => '1',
35-
failovermethod => 'priority',
40+
failovermethod => $yum_failovermethod,
3641
gpgkey => 'file:///etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL',
3742
gpgcheck => '1',
3843
priority => $priority,
@@ -46,7 +51,7 @@
4651
descr => $source_descr,
4752
baseurl => $source_baseurl,
4853
enabled => $yum_source_enabled,
49-
failovermethod => 'priority',
54+
failovermethod => $yum_failovermethod,
5055
gpgkey => 'file:///etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL',
5156
gpgcheck => '1',
5257
priority => $priority,

spec/setup_acceptance_node.pp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Facter < 4 needs lsb-release for os.distro.codename
2+
if versioncmp($facts['facterversion'], '4.0.0') < 0 and $facts['os']['family'] == 'Debian' {
3+
package { 'lsb-release':
4+
ensure => 'installed',
5+
}
6+
}

0 commit comments

Comments
 (0)