Skip to content

Commit ac32021

Browse files
author
David Swan
committed
[FM-6955] Removal of unsupported OS from ntp
1 parent 59e2e22 commit ac32021

File tree

2 files changed

+5
-23
lines changed

2 files changed

+5
-23
lines changed

metadata.json

-9
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,10 @@
4141
{
4242
"operatingsystem": "Scientific",
4343
"operatingsystemrelease": [
44-
"5",
4544
"6",
4645
"7"
4746
]
4847
},
49-
{
50-
"operatingsystem": "Fedora",
51-
"operatingsystemrelease": [
52-
"24",
53-
"25"
54-
]
55-
},
5648
{
5749
"operatingsystem": "SLES",
5850
"operatingsystemrelease": [
@@ -63,7 +55,6 @@
6355
{
6456
"operatingsystem": "Debian",
6557
"operatingsystemrelease": [
66-
"7",
6758
"8"
6859
]
6960
},

spec/classes/ntp_spec.rb

+5-14
Original file line numberDiff line numberDiff line change
@@ -398,20 +398,11 @@
398398
context 'when choosing the default pool servers' do
399399
case f[:os]['family']
400400
when 'RedHat'
401-
if f[:os]['name'] == 'Fedora'
402-
it 'uses the fedora ntp servers' do
403-
is_expected.to contain_file('/etc/ntp.conf').with('content' => %r{server \d.fedora.pool.ntp.org})
404-
end
405-
it do
406-
is_expected.to contain_file('/etc/ntp/step-tickers').with('content' => %r{\d.fedora.pool.ntp.org})
407-
end
408-
else
409-
it 'uses the centos ntp servers' do
410-
is_expected.to contain_file('/etc/ntp.conf').with('content' => %r{server \d.centos.pool.ntp.org})
411-
end
412-
it do
413-
is_expected.to contain_file('/etc/ntp/step-tickers').with('content' => %r{\d.centos.pool.ntp.org})
414-
end
401+
it 'uses the centos ntp servers' do
402+
is_expected.to contain_file('/etc/ntp.conf').with('content' => %r{server \d.centos.pool.ntp.org})
403+
end
404+
it do
405+
is_expected.to contain_file('/etc/ntp/step-tickers').with('content' => %r{\d.centos.pool.ntp.org})
415406
end
416407
when 'Debian'
417408
it 'uses the debian ntp servers' do

0 commit comments

Comments
 (0)