Skip to content

Commit a4ae8d8

Browse files
committed
Stop using $::osfamily but use $::facts['osfamily']
Also modernized the compile.and_raise_error test.
1 parent a393189 commit a4ae8d8

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

manifests/bond.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
source => 'bonding',
168168
}
169169

170-
case $::osfamily {
170+
case $facts['osfamily'] {
171171
'Debian': {
172172
network::bond::debian { $name:
173173
ensure => $ensure,
@@ -221,7 +221,7 @@
221221
}
222222
}
223223
default: {
224-
fail("network::bond does not support osfamily '${::osfamily}'")
224+
fail("network::bond does not support osfamily '${facts['osfamily']}'")
225225
}
226226
}
227227
}

manifests/bond/setup.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# make it work on debian..
22
class network::bond::setup {
33

4-
case $::osfamily {
4+
case $facts['osfamily'] {
55
'Debian': {
66
package { 'ifenslave-2.6':
77
ensure => present,

manifests/init.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
$ensure_ipaddress = present,
6565
) {
6666

67-
if $::osfamily == 'Debian' and $manage_ifupdown_extra {
67+
if $facts['osfamily'] == 'Debian' and $manage_ifupdown_extra {
6868
package { $ifupdown_extra:
6969
ensure => $ensure_ifupdown_extra,
7070
provider => $ifupdown_extra_provider,

spec/defines/bond_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
let(:facts) { { osfamily: 'SparrowOS' } }
6565

6666
it 'fails to compile' do
67-
expect { is_expected.to compile }.to raise_error(%r{network::bond does not support osfamily 'SparrowOS'})
67+
is_expected.to compile.and_raise_error(%r{network::bond does not support osfamily 'SparrowOS'})
6868
end
6969
end
7070
end

0 commit comments

Comments
 (0)