From ac32021e2c7a148152f64f3576cf86cd5a61c069 Mon Sep 17 00:00:00 2001
From: David Swan <david.swan@puppet.co.uk>
Date: Fri, 25 May 2018 12:12:44 +0100
Subject: [PATCH] [FM-6955] Removal of unsupported OS from ntp

---
 metadata.json            |  9 ---------
 spec/classes/ntp_spec.rb | 19 +++++--------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/metadata.json b/metadata.json
index 4267404c..bea3dd5c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -41,18 +41,10 @@
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
-        "5",
         "6",
         "7"
       ]
     },
-    {
-      "operatingsystem": "Fedora",
-      "operatingsystemrelease": [
-        "24",
-        "25"
-      ]
-    },
     {
       "operatingsystem": "SLES",
       "operatingsystemrelease": [
@@ -63,7 +55,6 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "7",
         "8"
       ]
     },
diff --git a/spec/classes/ntp_spec.rb b/spec/classes/ntp_spec.rb
index cf9419f5..c10c9950 100644
--- a/spec/classes/ntp_spec.rb
+++ b/spec/classes/ntp_spec.rb
@@ -398,20 +398,11 @@
         context 'when choosing the default pool servers' do
           case f[:os]['family']
           when 'RedHat'
-            if f[:os]['name'] == 'Fedora'
-              it 'uses the fedora ntp servers' do
-                is_expected.to contain_file('/etc/ntp.conf').with('content' => %r{server \d.fedora.pool.ntp.org})
-              end
-              it do
-                is_expected.to contain_file('/etc/ntp/step-tickers').with('content' => %r{\d.fedora.pool.ntp.org})
-              end
-            else
-              it 'uses the centos ntp servers' do
-                is_expected.to contain_file('/etc/ntp.conf').with('content' => %r{server \d.centos.pool.ntp.org})
-              end
-              it do
-                is_expected.to contain_file('/etc/ntp/step-tickers').with('content' => %r{\d.centos.pool.ntp.org})
-              end
+            it 'uses the centos ntp servers' do
+              is_expected.to contain_file('/etc/ntp.conf').with('content' => %r{server \d.centos.pool.ntp.org})
+            end
+            it do
+              is_expected.to contain_file('/etc/ntp/step-tickers').with('content' => %r{\d.centos.pool.ntp.org})
             end
           when 'Debian'
             it 'uses the debian ntp servers' do