From: Daniel Farrell <dfarrell@redhat.com>
Date: Mon, 30 Nov 2015 19:19:41 +0000 (-0500)
Subject: Don't fail for unreleased Fedora, only EOL
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=50fffef7b2665d1787431520352ed011fadb1ae2;hp=0cf7d65daeaf04c058addd9cac38d34da21a6260;p=integration%2Fpackaging%2Fpuppet-opendaylight.git

Don't fail for unreleased Fedora, only EOL

When checking if the version of Fedora is supported, only fail for known
EOL versions. Don't fail for unreleased or very new versions, to allow
for hopeful-compatibility and any actual bugs to be exposed.

Change-Id: I7d5b814ea9b3e1f1f3ce999993887e0d6c58a191
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
---

diff --git a/manifests/init.pp b/manifests/init.pp
index 2bef9e4..5ad6106 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -47,7 +47,7 @@ class opendaylight (
     }
     fedora: {
       # Fedora distros < 20 are EOL as of Jan 6th 2015
-      if ! ($::operatingsystemmajrelease in ['20', '21']) {
+      if $::operatingsystemmajrelease < '20' {
         fail("Unsupported OS: ${::operatingsystem} ${::operatingsystemmajrelease}")
       }
     }
diff --git a/spec/classes/opendaylight_spec.rb b/spec/classes/opendaylight_spec.rb
index 8d519e1..eeec06a 100644
--- a/spec/classes/opendaylight_spec.rb
+++ b/spec/classes/opendaylight_spec.rb
@@ -35,7 +35,7 @@ describe 'opendaylight' do
         end
 
         # All tests for unsupported versions of Fedora
-        ['18', '19', '22'].each do |operatingsystemmajrelease|
+        ['19'].each do |operatingsystemmajrelease|
           context "#{operatingsystemmajrelease}" do
             let(:facts) {{
               :osfamily => osfamily,