diff --git a/lib/puppet/provider/cs_clone/crm.rb b/lib/puppet/provider/cs_clone/crm.rb index 3d775be3..d01fe85e 100644 --- a/lib/puppet/provider/cs_clone/crm.rb +++ b/lib/puppet/provider/cs_clone/crm.rb @@ -20,6 +20,8 @@ mk_resource_methods + defaultfor operatingsystem: [:ubuntu] + def self.instances block_until_ready diff --git a/lib/puppet/provider/cs_colocation/crm.rb b/lib/puppet/provider/cs_colocation/crm.rb index ecd8f5b1..feb3b1d4 100644 --- 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 operatingsystem: [:ubuntu] + def self.instances block_until_ready diff --git a/lib/puppet/provider/cs_commit/crm.rb b/lib/puppet/provider/cs_commit/crm.rb index 8fe2504a..7960c9ed 100644 --- 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 operatingsystem: [: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 index fa115700..b7a63689 100644 --- 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 operatingsystem: [:ubuntu] + def self.instances block_until_ready diff --git a/lib/puppet/provider/cs_location/crm.rb b/lib/puppet/provider/cs_location/crm.rb index e87bd061..52d9c894 100644 --- a/lib/puppet/provider/cs_location/crm.rb +++ b/lib/puppet/provider/cs_location/crm.rb @@ -26,6 +26,8 @@ mk_resource_methods + defaultfor operatingsystem: [: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_order/crm.rb b/lib/puppet/provider/cs_order/crm.rb index 62f1278d..1ad545de 100644 --- a/lib/puppet/provider/cs_order/crm.rb +++ b/lib/puppet/provider/cs_order/crm.rb @@ -21,6 +21,8 @@ mk_resource_methods + defaultfor operatingsystem: [:ubuntu] + def self.instances block_until_ready diff --git a/lib/puppet/provider/cs_primitive/crm.rb b/lib/puppet/provider/cs_primitive/crm.rb index d8c966a7..65bf11a8 100644 --- a/lib/puppet/provider/cs_primitive/crm.rb +++ b/lib/puppet/provider/cs_primitive/crm.rb @@ -22,6 +22,9 @@ # Path to the crm binary for interacting with the cluster configuration. commands crm: 'crm' + defaultfor operatingsystem: [:ubuntu] + + # given an XML element (a 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_property/crm.rb b/lib/puppet/provider/cs_property/crm.rb index 4e9a0cac..f7d18fd8 100644 --- 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 operatingsystem: [:ubuntu] + def self.instances block_until_ready diff --git a/lib/puppet/provider/cs_rsc_defaults/crm.rb b/lib/puppet/provider/cs_rsc_defaults/crm.rb index 493e3f72..d691c11e 100644 --- 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 operatingsystem: [:ubuntu] + def self.instances block_until_ready diff --git a/lib/puppet/provider/cs_shadow/crm.rb b/lib/puppet/provider/cs_shadow/crm.rb index 158e56b3..477b334f 100644 --- 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 operatingsystem: [:ubuntu] + def self.instances block_until_ready(120, true) []