Skip to content

Commit e1a5392

Browse files
committed
Replace legacy facts - make puppet8 ready
1 parent e8c3bef commit e1a5392

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

manifests/init.pp

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
String $config_class = $opensm::params::config_class,
99
String $service = $opensm::params::service
1010
) inherits opensm::params {
11-
12-
1311
class { 'opensm::install':
1412
enabled => $enabled,
1513
packages => $packages,
@@ -29,14 +27,14 @@
2927
}
3028

3129
anchor { 'opensm::begin': ; }
32-
-> Class['opensm::install']
33-
-> Class["opensm::config::${config_class}"]
34-
~> Class['opensm::service']
35-
-> anchor { 'opensm::end': ; }
30+
-> Class['opensm::install']
31+
-> Class["opensm::config::${config_class}"]
32+
~> Class['opensm::service']
33+
-> anchor { 'opensm::end': ; }
3634
} else {
3735
anchor { 'opensm::begin': ; }
38-
-> Class['opensm::service']
39-
-> Class['opensm::install']
40-
-> anchor { 'opensm::end': ; }
36+
-> Class['opensm::service']
37+
-> Class['opensm::install']
38+
-> anchor { 'opensm::end': ; }
4139
}
4240
}

manifests/params.pp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
$priority = 0
55
$options = {}
66

7-
case $::operatingsystem {
8-
debian,ubuntu: {
7+
case $facts['os']['name'] {
8+
'Debian','Ubuntu': {
99
$guids = 'ALL'
1010
$service = 'opensm'
1111
$configuration = '/etc/opensm/opensm.conf'
1212
$config_class = 'debian'
1313
}
1414

15-
redhat,centos,scientific,oraclelinux,fedora,rocky,almalinux: {
15+
'RedHat','Centos','Scientific','OracleLinux','Fedora','Rocky','AlmaLinux': {
1616
$guids = ''
1717
$service = 'opensm'
1818
$configuration = '/etc/rdma/opensm.conf'
1919
$config_class = 'redhat'
2020
}
2121

2222
default: {
23-
fail("Unsupported OS: ${::operatingsystem}")
23+
fail("Unsupported OS: ${facts['os']['name']}")
2424
}
2525
}
2626
}

0 commit comments

Comments
 (0)