Merge pull request #529 from bastelfreak/debian

Drop Debian 9 support
voxpupuli · Nov 16, 2022 · f5cd461 · f5cd461
2 parents 5f48a6c + 8c40809
commit f5cd461
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 46 deletions.
diff --git a/data/os/Debian.yaml b/data/os/Debian.yaml
diff --git a/metadata.json b/metadata.json
@@ -23,7 +23,6 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "9",
         "10",
         "11"
       ]

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -23,31 +23,3 @@
 require 'spec_helper_corosync'
 
 require 'spec_helper_methods'
-
-# add_custom_fact :corosync_stack, lambda { |os, facts|
-#  case facts[:os]['family']
-#  when 'RedHat'
-#    'pcs'
-#  when 'Debian'
-#    case facts[:os]['name']
-#    when 'Debian'
-#      if facts[:os]['release']['major'].to_i > 9
-#        'pcs'
-#      else
-#        'crm'
-#      end
-#    when 'Ubuntu'
-#      if facts[:os]['release']['major'].to_i > 18
-#        'pcs'
-#      elsif facts[:os]['release']['major'].to_i > 16
-#        'pcs'
-#      else
-#        'crm'
-#      end
-#    end
-#  when 'Suse'
-#    'crm'
-#  else
-#    'crm'
-#  end
-# }
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -12,13 +12,8 @@
   when 'Debian'
     case fact_on(host, 'os.name')
     when 'Debian'
-      if fact_on(host, 'os.release.major').to_i > 9
-        default_provider = 'pcs'
-        pcs_version = '0.10.0'
-      else
-        default_provider = 'crm'
-        pcs_version = ''
-      end
+      default_provider = 'pcs'
+      pcs_version = '0.10.0'
     when 'Ubuntu'
       if fact_on(host, 'os.release.major').to_i > 18
         default_provider = 'pcs'

diff --git a/spec/spec_helper_corosync.rb b/spec/spec_helper_corosync.rb
@@ -12,13 +12,8 @@ def corosync_stack(facts)
   when 'Debian'
     case facts[:os]['name']
     when 'Debian'
-      if facts[:os]['release']['major'].to_i > 9
-        corosync_stack = 'pcs'
-        pcs_version = '0.10.0'
-      else
-        corosync_stack = 'crm'
-        pcs_version = ''
-      end
+      corosync_stack = 'pcs'
+      pcs_version = '0.10.0'
     when 'Ubuntu'
       if facts[:os]['release']['major'].to_i > 18
         corosync_stack = 'pcs'
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,6 @@ @@
         {
           "operatingsystem": "Debian",
           "operatingsystemrelease": [
-            "9",
             "10",
             "11"
           ]
@@ Expand Down @@