Skip to content

Commit a42264c

Browse files
committed
Convert all (ancient) top scope facts
1 parent 9ec7ec7 commit a42264c

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

manifests/server/ads.pp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@
2424
$target_ou = 'Nix_Mashine',
2525
$perform_join = true) {
2626

27-
$krb5_user_package = $::osfamily ? {
27+
require 'samba::server'
28+
29+
$krb5_user_package = $facts['os']['family'] ? {
2830
'RedHat' => 'krb5-workstation',
2931
default => 'krb5-user',
3032
}
3133

32-
if $::osfamily == 'RedHat' {
33-
if $::operatingsystemrelease =~ /^6\./ {
34+
if $facts['os']['family'] == 'RedHat' {
35+
if $facts['os']['release']['major'] == '6' {
3436
$winbind_package = 'samba-winbind'
3537
} else {
3638
$winbind_package = 'samba-common'

manifests/server/params.pp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# == Class samba::server::params
22
#
33
class samba::server::params {
4-
case $::osfamily {
4+
case $facts['os']['family'] {
55
'Redhat': { $service_name = 'smb' }
66
'Debian': {
7-
case $::operatingsystem {
7+
case $facts['os']['name'] {
88
'Debian': {
9-
case $::operatingsystemmajrelease {
9+
case $facts['os']['release']['major'] {
1010
'8' : { $service_name = 'smbd' }
1111
default: { $service_name = 'samba' }
1212
}
@@ -23,6 +23,6 @@
2323
$service_name = 'smbd'
2424
$nmbd_name = 'nmbd'
2525
}
26-
default: { fail("${::osfamily} is not supported by this module.") }
26+
default: { fail("${facts['os']['family']} is not supported by this module.") }
2727
}
2828
}

0 commit comments

Comments
 (0)