Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
base
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
puppetpublic
base
Commits
97c061e0
Commit
97c061e0
authored
9 years ago
by
Jonathan Lent
Browse files
Options
Downloads
Patches
Plain Diff
rpm: removing package ensure on EL6
parent
f2a62d42
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
NEWS
+6
-0
6 additions, 0 deletions
NEWS
manifests/rpm.pp
+4
-7
4 additions, 7 deletions
manifests/rpm.pp
with
10 additions
and
7 deletions
NEWS
+
6
−
0
View file @
97c061e0
UNRELEASED
[rpm] Remove EL6 package requires of yum-plugin-downloadonly, since
yum-3.2.29-69 includes this plugin and obsoletes the individual
package (thus putting the puppet ensure in a loop) (jlent)
release/004.051 (2015-07-24)
[os] Small fix in base::os::debian to one of the systemd-related
...
...
This diff is collapsed.
Click to expand it.
manifests/rpm.pp
+
4
−
7
View file @
97c061e0
...
...
@@ -68,15 +68,12 @@ class base::rpm {
}
# RHEL5+
default
:
{
# EL7 includes this plugin by default
if
(
$::lsbmajdistrelease
!=
'7'
)
{
$yumpackage
=
$::lsbmajdistrelease
?
{
'5'
=>
'yum-downloadonly'
,
'6'
=>
'yum-plugin-downloadonly'
,
# EL6/7 includes this plugin by default
if
(
$::lsbmajdistrelease
==
'5'
)
{
package
{
'yum-downloadonly'
:
ensure
=>
installed
,
}
package
{
$yumpackage
:
ensure
=>
present
;
}
}
# RHEL systems need this plugin enabled, due to new licensing
if
(
$::operatingsystem
==
'RedHat'
)
{
# enable yum rhn plugin
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment