From 97e31dfea09fc1d5a943d85b3d23e1e71c5eac0d Mon Sep 17 00:00:00 2001
From: Daniel Farrell <dfarrell@redhat.com>
Date: Thu, 30 Mar 2017 16:31:32 -0400
Subject: [PATCH] Update Fedora versions supported, testing levels

Change-Id: I71f2576ea3b8bd63600c11e13bf814851b9e6cde
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
---
 manifests/init.pp                 | 6 ++++--
 metadata.json                     | 4 ++--
 spec/classes/opendaylight_spec.rb | 4 ++--
 spec/spec_helper_acceptance.rb    | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index bd26f19..ae7b4f9 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -80,10 +80,12 @@ class opendaylight (
         }
     }
     fedora: {
-      # Fedora distros < 22 are EOL as of 2015-12-01
+      # Fedora distros < 24 are EOL as of 2016-12-20
       # https://fedoraproject.org/wiki/End_of_life
-      if $::operatingsystemmajrelease < '22' {
+      if $::operatingsystemmajrelease < '24' {
         fail("Unsupported OS: ${::operatingsystem} ${::operatingsystemmajrelease}")
+      } else {
+        warning('Fedora is not as well tested as CentOS.')
       }
     }
     ubuntu: {
diff --git a/metadata.json b/metadata.json
index bfe8c3b..48692d0 100644
--- a/metadata.json
+++ b/metadata.json
@@ -44,8 +44,8 @@
         {
             "operatingsystem": "Fedora",
             "operatingsystemrelease": [
-                "22",
-                "23"
+                "24",
+                "25"
             ]
         },
         {
diff --git a/spec/classes/opendaylight_spec.rb b/spec/classes/opendaylight_spec.rb
index 18a69e5..5f77050 100644
--- a/spec/classes/opendaylight_spec.rb
+++ b/spec/classes/opendaylight_spec.rb
@@ -11,7 +11,7 @@ describe 'opendaylight' do
         operatingsystem = 'Fedora'
 
         # All tests for supported versions of Fedora
-        ['22', '23'].each do |operatingsystemmajrelease|
+        ['24', '25'].each do |operatingsystemmajrelease|
           context "#{operatingsystemmajrelease}" do
             let(:facts) {{
               :osfamily => osfamily,
@@ -50,7 +50,7 @@ describe 'opendaylight' do
         end
 
         # All tests for unsupported versions of Fedora
-        ['21'].each do |operatingsystemmajrelease|
+        ['23'].each do |operatingsystemmajrelease|
           context "#{operatingsystemmajrelease}" do
             let(:facts) {{
               :osfamily => osfamily,
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 23696c6..f911b3d 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -166,7 +166,7 @@ def generic_validations()
     it { should be_grouped_into 'odl' }
   end
 
-  if ['centos-7', 'centos-7-docker', 'fedora-22', 'fedora-23', 'fedora-23-docker'].include? ENV['RS_SET']
+  if ['centos-7', 'centos-7-docker'].include? ENV['RS_SET']
     # Validations for modern Red Hat family OSs
 
     # Verify ODL systemd .service file
-- 
2.36.6