Skip to content

Commit ea3feb2

Browse files
authored
Merge pull request #494 from ekohl/remove-service-detection
Move to Debian 9 and Ubuntu 16.04/18.04
2 parents 9c0ef87 + 88f239f commit ea3feb2

2 files changed

Lines changed: 3 additions & 26 deletions

File tree

manifests/params.pp

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -171,27 +171,4 @@
171171
fail("Osfamily ${::osfamily} and ${::operatingsystem} is not supported")
172172
}
173173
}
174-
175-
case $::operatingsystem {
176-
'Debian': {
177-
case $::operatingsystemmajrelease {
178-
'8': {
179-
$service_provider = pick($service_provider, 'systemd')
180-
}
181-
default: {
182-
$service_provider = pick($service_provider, 'debian')
183-
}
184-
}
185-
}
186-
'Ubuntu': {
187-
if versioncmp($::operatingsystemmajrelease, '16') >= 0 {
188-
$service_provider = pick($service_provider, 'systemd')
189-
} else {
190-
$service_provider = pick($service_provider, 'upstart')
191-
}
192-
}
193-
default: {
194-
$service_provider = undef
195-
}
196-
}
197174
}

metadata.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
{
2424
"operatingsystem": "Debian",
2525
"operatingsystemrelease": [
26-
"8"
26+
"9"
2727
]
2828
},
2929
{
3030
"operatingsystem": "Ubuntu",
3131
"operatingsystemrelease": [
32-
"14.04",
33-
"16.04"
32+
"16.04",
33+
"18.04"
3434
]
3535
}
3636
],

0 commit comments

Comments
 (0)