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 2bef9e41a06d76f99852c6bcc8caf609ea358aae..5ad61066a972e374cd51a24d5800bfad04f12449 100644 (file)
--- 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 8d519e13b3b8b4e3ad32c5502e29fc259517d151..eeec06a6743c41a27f99722564c168d692b33094 100644 (file)
--- 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,