Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Lonlone Lee
base
Commits
ceb1c59c
Commit
ceb1c59c
authored
Jun 03, 2016
by
Jonathan Lent
Browse files
Fixes related to Oracle Linux, see NEWS
parent
c68ad098
Changes
5
Hide whitespace changes
Inline
Side-by-side
NEWS
View file @
ceb1c59c
release
/
004.062
(
2016
-
06
-
03
)
[
os
]
Fix
references
applicable
to
Oracle
Linux
[
cron
]
Address
cron
-
related
package
not
available
on
Oracle
Linux
[
puppetclient
]
Address
lack
of
versionlock
on
Oracle
Linux
(
jlent
)
release
/
004.061
(
2016
-
04
-
21
)
[
os
]
Add
some
parameters
to
the
base
::
os
::
debian
class
to
make
apt
use
...
...
manifests/cron.pp
View file @
ceb1c59c
...
...
@@ -26,11 +26,15 @@ class base::cron(
elsif
(
$::osfamily
==
'RedHat'
)
{
$crond
=
'crond'
if
(
$::lsbmajdistrelease
==
'6'
)
{
package
{
'cronie-noanacron'
:
ensure
=>
present
;
'cronie-anacron'
:
ensure
=>
absent
;
# OL6 appears to be stuck with cronie-anacron
if
(
$::operatingsystem
==
'OracleLinux'
)
{
package
{
'cronie-anacron'
:
ensure
=>
present
}
}
else
{
# Otherwise, prefer cronie-noanacron
package
{
'cronie-noanacron'
:
ensure
=>
present
;
'cronie-anacron'
:
ensure
=>
absent
;
}
}
}
file
{
[
'/etc/cron.d/dailyjobs'
,
'/etc/cron.d/0hourly'
]:
ensure
=>
absent
...
...
manifests/os.pp
View file @
ceb1c59c
...
...
@@ -4,12 +4,12 @@
class
base::os
{
case
$::operatingsystem
{
'Debian'
:
{
include
base::os::debian
}
'Ubuntu'
:
{
include
base::os::ubuntu
}
'RedHat'
:
{
include
base::os::redhat
}
'CentOS'
:
{
include
base::os::centos
}
'O
EL'
:
{
include
base::os::o
el
}
default
:
{
include
base::os::debian
}
'Debian'
:
{
include
base::os::debian
}
'Ubuntu'
:
{
include
base::os::ubuntu
}
'RedHat'
:
{
include
base::os::redhat
}
'CentOS'
:
{
include
base::os::centos
}
'O
racleLinux'
:
{
include
base::os::o
raclelinux
}
default
:
{
include
base::os::debian
}
}
base::os::motd
{
'/etc/motd'
:
...
...
manifests/os/o
el
.pp
→
manifests/os/o
raclelinux
.pp
View file @
ceb1c59c
#
# Rules specific to Oracle
Enterprise
Linux systems.
# Rules specific to Oracle Linux systems.
# Simply stubbing for now
class
base::os::o
el
{
class
base::os::o
raclelinux
{
# For now, let's pretend it's just RedHat
include
base::os::redhat
...
...
manifests/puppetclient.pp
View file @
ceb1c59c
...
...
@@ -9,14 +9,15 @@ class base::puppetclient {
}
# pin puppet and facter versions on RHELish systems
if
(
$::osfamily
==
'RedHat'
)
{
# However, OracleLinux (6, at least) does not have yum-versionlock available
if
((
$::osfamily
==
'RedHat'
)
and
(
$::operatingsystem
!=
'OracleLinux'
))
{
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
}
else
{
# Debianish systems
and Oracle Linux
package
{
'puppet'
:
ensure
=>
present
,
require
=>
Base
::
Puppetclient
::
Config
[
'/etc/puppet/puppet.conf'
],
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment