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
d9cfa037
Commit
d9cfa037
authored
10 years ago
by
Jonathan Lent
Browse files
Options
Downloads
Patches
Plain Diff
See NEWS; edits to facilitate Puppet 3 RHEL upgrades
parent
a74eb181
No related branches found
Branches containing commit
Tags
release/004.031
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
NEWS
+5
-1
5 additions, 1 deletion
NEWS
manifests/puppetclient.pp
+14
-3
14 additions, 3 deletions
manifests/puppetclient.pp
manifests/yumtools/yum_puppet_lock.pp
+17
-0
17 additions, 0 deletions
manifests/yumtools/yum_puppet_lock.pp
with
36 additions
and
4 deletions
NEWS
+
5
−
1
View file @
d9cfa037
release/??????? (2015-02-2
5
)
release/??????? (2015-02-2
7
)
Beginning of work to support RHEL-ish operating systems
such as CentOS and Oracle Linux. The most common change
...
...
@@ -7,6 +7,10 @@ release/??????? (2015-02-25)
potentially affect any existing hosts. There may be some
additional refinements when CentOS and Oracle hosts come
online; for now, we're assuming they act identical to RHEL.
Additionally modified puppetclient.pp to support version
locking of puppet and facter versions on RHEL systems.
Added one additional manifest to facilitate this.
(jlent)
release/004.030 (2015-02-25)
...
...
This diff is collapsed.
Click to expand it.
manifests/puppetclient.pp
+
14
−
3
View file @
d9cfa037
# install and configure the puppet client
class
base::puppetclient
{
file
{
'/etc/puppet'
:
ensure
=>
directory
,
...
...
@@ -7,9 +8,19 @@ class base::puppetclient {
ensure
=>
present
,
}
package
{
'puppet'
:
ensure
=>
present
,
require
=>
Base
::
Puppetclient
::
Config
[
'/etc/puppet/puppet.conf'
],
# pin puppet and facter versions on RHELish systems
if
(
$::osfamily
==
'RedHat'
)
{
include
base::yumtools::yum_puppet_lock
package
{
'puppet'
:
ensure
=>
present
,
require
=>
[
Base
::
Puppetclient
::
Config
[
'/etc/puppet/puppet.conf'
],
Class
[
'base::yumtools::yum_puppet_lock'
]
],
}
}
else
{
# Debianish systems; pinning handled at repository level
package
{
'puppet'
:
ensure
=>
present
,
require
=>
Base
::
Puppetclient
::
Config
[
'/etc/puppet/puppet.conf'
],
}
}
# It appears that on recently updated wheezy servers, 2.x clients need
...
...
This diff is collapsed.
Click to expand it.
manifests/yumtools/yum_puppet_lock.pp
0 → 100644
+
17
−
0
View file @
d9cfa037
# Parameterized class to lock puppet and facter versions
# on RHEL-ish hosts using yum versionlock
# facter_version: the yum-aware version of facter to lock
# puppet_version: the yum-aware version of puppet to lock
class
base::yumtools::yum_puppet_lock
(
$facter_version
=
'2.2.0-1'
,
$puppet_version
=
'3.7.2-1'
)
{
base::yumtools::versionlock
{
"0:puppet-
${puppet_version}
.el
${::lsbmajdistrelease}
*"
:
ensure
=>
present
,
}
base::yumtools::versionlock
{
"1:facter-
${facter_version}
.el
${::lsbmajdistrelease}
*"
:
ensure
=>
present
,
}
}
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