Skip to content

Commit e834722

Browse files
committed
Merge pull request jhoblitt#13 from ajmaidak/4xparser
operatingsystemmajrelease fact is a string
2 parents dd9141f + 8d595c7 commit e834722

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

manifests/params.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@
2323
}
2424
} else {
2525
case $::operatingsystemmajrelease {
26-
5: {
26+
'5': {
2727
$udev_package = 'udev'
2828
$udevtrigger = 'udevtrigger'
2929
$udevlogpriority = 'udevcontrol log_priority'
3030
}
31-
6: {
31+
'6': {
3232
$udev_package = 'udev'
3333
$udevtrigger = 'udevadm trigger'
3434
$udevlogpriority = 'udevadm control --log-priority'
3535
}
36-
7: {
36+
'7': {
3737
$udev_package = 'systemd'
3838
$udevtrigger = 'udevadm trigger'
3939
$udevlogpriority = 'udevadm control --log-priority'

spec/classes/params_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
let :facts do
66
{
77
:osfamily => 'RedHat',
8-
:operatingsystemmajrelease => 6,
8+
:operatingsystemmajrelease => '6',
99
}
1010
end
1111

@@ -17,7 +17,7 @@
1717
let :facts do
1818
{
1919
:osfamily => 'RedHat',
20-
:operatingsystemmajrelease => 4,
20+
:operatingsystemmajrelease => '4',
2121
}
2222
end
2323

spec/classes/udev_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
let :facts do
2828
{
2929
:osfamily => 'RedHat',
30-
:operatingsystemmajrelease => 6,
30+
:operatingsystemmajrelease => '6',
3131
}
3232
end
3333

spec/classes/udevadm/logpriority_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
describe 'for osfamily RedHat and operatingsystemmajrelease 6' do
3232
let(:facts) do
3333
{ :osfamily => 'RedHat',
34-
:operatingsystemmajrelease => 6,
34+
:operatingsystemmajrelease => '6',
3535
}
3636
end
3737

@@ -66,7 +66,7 @@
6666
describe 'for osfamily RedHat and operatingsystemmajrelease 5' do
6767
let(:facts) do
6868
{ :osfamily => 'RedHat',
69-
:operatingsystemmajrelease => 5,
69+
:operatingsystemmajrelease => '5',
7070
}
7171
end
7272

spec/classes/udevadm/trigger_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
describe 'for osfamily RedHat' do
66
let(:facts) do
77
{ :osfamily => 'RedHat',
8-
:operatingsystemmajrelease => 6,
8+
:operatingsystemmajrelease => '6',
99
}
1010
end
1111

@@ -21,7 +21,7 @@
2121
describe 'for osfamily RedHat' do
2222
let(:facts) do
2323
{ :osfamily => 'RedHat',
24-
:operatingsystemmajrelease => 5,
24+
:operatingsystemmajrelease => '5',
2525
}
2626
end
2727

spec/defines/rule_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
let :facts do
2727
{
2828
:osfamily => 'RedHat',
29-
:operatingsystemmajrelease => 6,
29+
:operatingsystemmajrelease => '6',
3030
}
3131
end
3232

0 commit comments

Comments
 (0)