voxpupuli · dploeger · Nov 2, 2023 · Feb 21, 2024 · Aug 5, 2024
diff --git a/lib/puppet/provider/cs_clone/crm.rb b/lib/puppet/provider/cs_clone/crm.rb
@@ -20,6 +20,8 @@
 
   mk_resource_methods
 
+  defaultfor 'os.family': [:ubuntu]
+
   def self.instances
     block_until_ready
 

diff --git a/lib/puppet/provider/cs_clone/pcs.rb b/lib/puppet/provider/cs_clone/pcs.rb
@@ -18,7 +18,7 @@
 
   mk_resource_methods
 
-  defaultfor operatingsystem: %i[fedora centos redhat]
+  defaultfor 'os.family': %i[fedora centos redhat]
 
   def change_clone_id(type, primitive, id, cib)
     xpath = "/cib/configuration/resources/clone[descendant::#{type}[@id='#{primitive}']]"

diff --git a/lib/puppet/provider/cs_colocation/crm.rb b/lib/puppet/provider/cs_colocation/crm.rb
@@ -20,6 +20,8 @@
   # Decided to just go with relative.
   commands crm: 'crm'
 
+  defaultfor 'os.family': [:ubuntu]
+
   def self.instances
     block_until_ready
 

diff --git a/lib/puppet/provider/cs_colocation/pcs.rb b/lib/puppet/provider/cs_colocation/pcs.rb
@@ -16,7 +16,7 @@
         of current primitive colocations on the system; add, delete, or adjust various
         aspects.'
 
-  defaultfor operatingsystem: %i[fedora centos redhat]
+  defaultfor 'os.family': %i[fedora centos redhat]
 
   commands pcs: 'pcs'
 

diff --git a/lib/puppet/provider/cs_commit/crm.rb b/lib/puppet/provider/cs_commit/crm.rb
@@ -20,6 +20,8 @@
   # Required for block_until_ready
   commands crm: 'crm'
 
+  defaultfor 'os.family': [:ubuntu]
+
   def self.instances
     block_until_ready
     []

diff --git a/lib/puppet/provider/cs_group/crm.rb b/lib/puppet/provider/cs_group/crm.rb
@@ -16,6 +16,8 @@
   # Path to the crm binary for interacting with the cluster configuration.
   commands crm: '/usr/sbin/crm'
 
+  defaultfor 'os.family': [:ubuntu]
+
   def self.instances
     block_until_ready
 

diff --git a/lib/puppet/provider/cs_group/pcs.rb b/lib/puppet/provider/cs_group/pcs.rb
@@ -13,7 +13,7 @@
 Puppet::Type.type(:cs_group).provide(:pcs, parent: PuppetX::Voxpupuli::Corosync::Provider::Pcs) do
   desc 'Provider to add, delete, manipulate primitive groups.'
 
-  defaultfor operatingsystem: %i[fedora centos redhat]
+  defaultfor 'os.family': %i[fedora centos redhat]
 
   # Path to the pcs binary for interacting with the cluster configuration.
   commands pcs: '/usr/sbin/pcs'

diff --git a/lib/puppet/provider/cs_location/crm.rb b/lib/puppet/provider/cs_location/crm.rb
@@ -26,6 +26,8 @@
 
   mk_resource_methods
 
+  defaultfor 'os.family': [:ubuntu]
+
   # we need to check if we run at least pacemakerd version 1.1.13 before enabling feature discovery
   # see http://blog.clusterlabs.org/blog/2014/feature-spotlight-controllable-resource-discovery
   begin

diff --git a/lib/puppet/provider/cs_location/pcs.rb b/lib/puppet/provider/cs_location/pcs.rb
@@ -16,7 +16,7 @@
         of current primitive locations on the system; add, delete, or adjust various
         aspects.'
 
-  defaultfor operatingsystem: %i[fedora centos redhat]
+  defaultfor 'os.family': %i[fedora centos redhat]
   has_feature :discovery
 
   commands pcs: 'pcs'

diff --git a/lib/puppet/provider/cs_order/crm.rb b/lib/puppet/provider/cs_order/crm.rb
@@ -21,6 +21,8 @@
 
   mk_resource_methods
 
+  defaultfor 'os.family': [:ubuntu]
+
   def self.instances
     block_until_ready
 

diff --git a/lib/puppet/provider/cs_order/pcs.rb b/lib/puppet/provider/cs_order/pcs.rb
@@ -16,7 +16,7 @@
         of current primitive start orders on the system; add, delete, or adjust various
         aspects.'
 
-  defaultfor operatingsystem: %i[fedora centos redhat]
+  defaultfor 'os.family': %i[fedora centos redhat]
 
   has_feature :kindness
 

diff --git a/lib/puppet/provider/cs_primitive/crm.rb b/lib/puppet/provider/cs_primitive/crm.rb
@@ -22,6 +22,8 @@
   # Path to the crm binary for interacting with the cluster configuration.
   commands crm: 'crm'
 
+  defaultfor 'os.family': [:ubuntu]
+
   # given an XML element (a <primitive> from cibadmin), produce a hash suitible
   # for creating a new provider instance.
   def self.element_to_hash(e)

diff --git a/lib/puppet/provider/cs_primitive/pcs.rb b/lib/puppet/provider/cs_primitive/pcs.rb
@@ -23,7 +23,7 @@
 
   mk_resource_methods
 
-  defaultfor operatingsystem: %i[fedora centos redhat]
+  defaultfor 'os.family': %i[fedora centos redhat]
 
   # given an XML element (a <primitive> from cibadmin), produce a hash suitible
   # for creating a new provider instance.

diff --git a/lib/puppet/provider/cs_property/crm.rb b/lib/puppet/provider/cs_property/crm.rb
@@ -19,6 +19,8 @@
   commands crm:           'crm'
   commands cibadmin:      'cibadmin'
 
+  defaultfor 'os.family': [:ubuntu]
+
   def self.instances
     block_until_ready
 

diff --git a/lib/puppet/provider/cs_property/pcs.rb b/lib/puppet/provider/cs_property/pcs.rb
@@ -15,7 +15,7 @@
         abstract corosync/pacemaker vs. keepalived. This provider will check the state
         of Corosync cluster configuration properties.'
 
-  defaultfor operatingsystem: %i[fedora centos redhat]
+  defaultfor 'os.family': %i[fedora centos redhat]
 
   # Path to the pcs binary for interacting with the cluster configuration.
   commands pcs: 'pcs'

diff --git a/lib/puppet/provider/cs_rsc_defaults/crm.rb b/lib/puppet/provider/cs_rsc_defaults/crm.rb
@@ -19,6 +19,8 @@
   commands crm:           'crm'
   commands cibadmin:      'cibadmin'
 
+  defaultfor 'os.family': [:ubuntu]
+
   def self.instances
     block_until_ready
 

diff --git a/lib/puppet/provider/cs_rsc_defaults/pcs.rb b/lib/puppet/provider/cs_rsc_defaults/pcs.rb
@@ -15,7 +15,7 @@
         abstract corosync/pacemaker vs. keepalived. This provider will check the state
         of Corosync global defaults for resource options.'
 
-  defaultfor operatingsystem: %i[fedora centos redhat]
+  defaultfor 'os.family': %i[fedora centos redhat]
 
   # Path to the pcs binary for interacting with the cluster configuration.
   commands pcs: 'pcs'

diff --git a/lib/puppet/provider/cs_shadow/crm.rb b/lib/puppet/provider/cs_shadow/crm.rb
@@ -19,6 +19,8 @@
   commands cibadmin: 'cibadmin'
   commands crm: 'crm'
 
+  defaultfor 'os.family': [:ubuntu]
+
   def self.instances
     block_until_ready(120, true)
     []