diff --git a/CHANGELOG.md b/CHANGELOG.md index 2656ec61..91ad7629 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,18 @@ +## 2016-06-16 - Release 1.2.1 +### Summary +- Workaround upstream Puppet bug regarding PuppetX ruby namespace (#278 #284 + SERVER-973) + ## 2016-06-14 - Release 1.2.0 ### Summary - Deprecate Cs\_primitive[manage\_target\_role] in favour of Cs\_primitive[unmanaged_metadata] +## 2016-06-16 - Release 1.1.1 +### Summary +- Workaround upstream Puppet bug regarding PuppetX ruby namespace (#278 #284 + SERVER-973) + ## 2016-06-13 - Release 1.1.0 ### Summary - Move helpers functions to PuppetX ruby namespace (#259) diff --git a/lib/puppet/provider/cs_clone/crm.rb b/lib/puppet/provider/cs_clone/crm.rb index 723e4838..20f28ff2 100644 --- a/lib/puppet/provider/cs_clone/crm.rb +++ b/lib/puppet/provider/cs_clone/crm.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/crmsh' +begin + require 'puppet_x/voxpupuli/corosync/provider/crmsh' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/crmsh' +end Puppet::Type.type(:cs_clone).provide(:crm, parent: PuppetX::Voxpupuli::Corosync::Provider::Crmsh) do desc 'Provider to add, delete, manipulate primitive clones.' diff --git a/lib/puppet/provider/cs_clone/pcs.rb b/lib/puppet/provider/cs_clone/pcs.rb index ee5fb2ff..a5096c2c 100644 --- a/lib/puppet/provider/cs_clone/pcs.rb +++ b/lib/puppet/provider/cs_clone/pcs.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/pcs' +begin + require 'puppet_x/voxpupuli/corosync/provider/pcs' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/pcs' +end Puppet::Type.type(:cs_clone).provide(:pcs, parent: PuppetX::Voxpupuli::Corosync::Provider::Pcs) do desc 'Provider to add, delete, manipulate primitive clones.' diff --git a/lib/puppet/provider/cs_colocation/crm.rb b/lib/puppet/provider/cs_colocation/crm.rb index 7340351b..5a08659c 100644 --- a/lib/puppet/provider/cs_colocation/crm.rb +++ b/lib/puppet/provider/cs_colocation/crm.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/crmsh' +begin + require 'puppet_x/voxpupuli/corosync/provider/crmsh' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/crmsh' +end Puppet::Type.type(:cs_colocation).provide(:crm, parent: PuppetX::Voxpupuli::Corosync::Provider::Crmsh) do desc 'Specific provider for a rather specific type since I currently have no plan to diff --git a/lib/puppet/provider/cs_colocation/pcs.rb b/lib/puppet/provider/cs_colocation/pcs.rb index c4767cf3..be642d8f 100644 --- a/lib/puppet/provider/cs_colocation/pcs.rb +++ b/lib/puppet/provider/cs_colocation/pcs.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/pcs' +begin + require 'puppet_x/voxpupuli/corosync/provider/pcs' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/pcs' +end Puppet::Type.type(:cs_colocation).provide(:pcs, parent: PuppetX::Voxpupuli::Corosync::Provider::Pcs) do desc 'Specific provider for a rather specific type since I currently have no plan to diff --git a/lib/puppet/provider/cs_commit/crm.rb b/lib/puppet/provider/cs_commit/crm.rb index 22347d80..91a15bdd 100644 --- a/lib/puppet/provider/cs_commit/crm.rb +++ b/lib/puppet/provider/cs_commit/crm.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/crmsh' +begin + require 'puppet_x/voxpupuli/corosync/provider/crmsh' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/crmsh' +end Puppet::Type.type(:cs_commit).provide(:crm, parent: PuppetX::Voxpupuli::Corosync::Provider::Crmsh) do commands crm_shadow: 'crm_shadow' diff --git a/lib/puppet/provider/cs_commit/pcs.rb b/lib/puppet/provider/cs_commit/pcs.rb index a76ffddd..84aa1622 100644 --- a/lib/puppet/provider/cs_commit/pcs.rb +++ b/lib/puppet/provider/cs_commit/pcs.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/pcs' +begin + require 'puppet_x/voxpupuli/corosync/provider/pcs' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/pcs' +end Puppet::Type.type(:cs_commit).provide(:pcs, parent: PuppetX::Voxpupuli::Corosync::Provider::Pcs) do commands crm_shadow: 'crm_shadow' diff --git a/lib/puppet/provider/cs_group/crm.rb b/lib/puppet/provider/cs_group/crm.rb index 70bd033a..041495c4 100644 --- a/lib/puppet/provider/cs_group/crm.rb +++ b/lib/puppet/provider/cs_group/crm.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/crmsh' +begin + require 'puppet_x/voxpupuli/corosync/provider/crmsh' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/crmsh' +end Puppet::Type.type(:cs_group).provide(:crm, parent: PuppetX::Voxpupuli::Corosync::Provider::Crmsh) do desc 'Provider to add, delete, manipulate primitive groups.' diff --git a/lib/puppet/provider/cs_group/pcs.rb b/lib/puppet/provider/cs_group/pcs.rb index f18e2bf2..45ea5710 100644 --- a/lib/puppet/provider/cs_group/pcs.rb +++ b/lib/puppet/provider/cs_group/pcs.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/pcs' +begin + require 'puppet_x/voxpupuli/corosync/provider/pcs' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/pcs' +end Puppet::Type.type(:cs_group).provide(:pcs, parent: PuppetX::Voxpupuli::Corosync::Provider::Pcs) do desc 'Provider to add, delete, manipulate primitive groups.' diff --git a/lib/puppet/provider/cs_location/crm.rb b/lib/puppet/provider/cs_location/crm.rb index b1593c0d..e5a4a88b 100644 --- a/lib/puppet/provider/cs_location/crm.rb +++ b/lib/puppet/provider/cs_location/crm.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/crmsh' +begin + require 'puppet_x/voxpupuli/corosync/provider/crmsh' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/crmsh' +end Puppet::Type.type(:cs_location).provide(:crm, parent: PuppetX::Voxpupuli::Corosync::Provider::Crmsh) do desc 'Specific provider for a rather specific type since I currently have no plan to diff --git a/lib/puppet/provider/cs_location/pcs.rb b/lib/puppet/provider/cs_location/pcs.rb index 4444d9b1..55b3674c 100644 --- a/lib/puppet/provider/cs_location/pcs.rb +++ b/lib/puppet/provider/cs_location/pcs.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/pcs' +begin + require 'puppet_x/voxpupuli/corosync/provider/pcs' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/pcs' +end Puppet::Type.type(:cs_location).provide(:pcs, parent: PuppetX::Voxpupuli::Corosync::Provider::Pcs) do desc 'Specific provider for a rather specific type since I currently have no plan to diff --git a/lib/puppet/provider/cs_order/crm.rb b/lib/puppet/provider/cs_order/crm.rb index 653d1749..4fa417a6 100644 --- a/lib/puppet/provider/cs_order/crm.rb +++ b/lib/puppet/provider/cs_order/crm.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/crmsh' +begin + require 'puppet_x/voxpupuli/corosync/provider/crmsh' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/crmsh' +end Puppet::Type.type(:cs_order).provide(:crm, parent: PuppetX::Voxpupuli::Corosync::Provider::Crmsh) do desc 'Specific provider for a rather specific type since I currently have no plan to diff --git a/lib/puppet/provider/cs_order/pcs.rb b/lib/puppet/provider/cs_order/pcs.rb index 5eecdbeb..a807320e 100644 --- a/lib/puppet/provider/cs_order/pcs.rb +++ b/lib/puppet/provider/cs_order/pcs.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/pcs' +begin + require 'puppet_x/voxpupuli/corosync/provider/pcs' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/pcs' +end Puppet::Type.type(:cs_order).provide(:pcs, parent: PuppetX::Voxpupuli::Corosync::Provider::Pcs) do desc 'Specific provider for a rather specific type since I currently have no plan to diff --git a/lib/puppet/provider/cs_primitive/crm.rb b/lib/puppet/provider/cs_primitive/crm.rb index 54f465f4..936e5e68 100644 --- a/lib/puppet/provider/cs_primitive/crm.rb +++ b/lib/puppet/provider/cs_primitive/crm.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/crmsh' +begin + require 'puppet_x/voxpupuli/corosync/provider/crmsh' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/crmsh' +end Puppet::Type.type(:cs_primitive).provide(:crm, parent: PuppetX::Voxpupuli::Corosync::Provider::Crmsh) do desc 'Specific provider for a rather specific type since I currently have no diff --git a/lib/puppet/provider/cs_primitive/pcs.rb b/lib/puppet/provider/cs_primitive/pcs.rb index fa056520..5a7c7152 100644 --- a/lib/puppet/provider/cs_primitive/pcs.rb +++ b/lib/puppet/provider/cs_primitive/pcs.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/pcs' +begin + require 'puppet_x/voxpupuli/corosync/provider/pcs' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/pcs' +end Puppet::Type.type(:cs_primitive).provide(:pcs, parent: PuppetX::Voxpupuli::Corosync::Provider::Pcs) do desc 'Specific provider for a rather specific type since I currently have no diff --git a/lib/puppet/provider/cs_property/crm.rb b/lib/puppet/provider/cs_property/crm.rb index 2b37ddd5..0256d3c7 100644 --- a/lib/puppet/provider/cs_property/crm.rb +++ b/lib/puppet/provider/cs_property/crm.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/crmsh' +begin + require 'puppet_x/voxpupuli/corosync/provider/crmsh' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/crmsh' +end Puppet::Type.type(:cs_property).provide(:crm, parent: PuppetX::Voxpupuli::Corosync::Provider::Crmsh) do desc 'Specific provider for a rather specific type since I currently have no plan to diff --git a/lib/puppet/provider/cs_property/pcs.rb b/lib/puppet/provider/cs_property/pcs.rb index 35b11956..11375233 100644 --- a/lib/puppet/provider/cs_property/pcs.rb +++ b/lib/puppet/provider/cs_property/pcs.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/pcs' +begin + require 'puppet_x/voxpupuli/corosync/provider/pcs' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/pcs' +end Puppet::Type.type(:cs_property).provide(:pcs, parent: PuppetX::Voxpupuli::Corosync::Provider::Pcs) do desc 'Specific provider for a rather specific type since I currently have no plan to diff --git a/lib/puppet/provider/cs_rsc_defaults/crm.rb b/lib/puppet/provider/cs_rsc_defaults/crm.rb index e682deb8..6237a08a 100644 --- a/lib/puppet/provider/cs_rsc_defaults/crm.rb +++ b/lib/puppet/provider/cs_rsc_defaults/crm.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/crmsh' +begin + require 'puppet_x/voxpupuli/corosync/provider/crmsh' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/crmsh' +end Puppet::Type.type(:cs_rsc_defaults).provide(:crm, parent: PuppetX::Voxpupuli::Corosync::Provider::Crmsh) do desc 'Specific provider for a rather specific type since I currently have no plan to diff --git a/lib/puppet/provider/cs_shadow/crm.rb b/lib/puppet/provider/cs_shadow/crm.rb index 8c5a5085..dc4e0b8a 100644 --- a/lib/puppet/provider/cs_shadow/crm.rb +++ b/lib/puppet/provider/cs_shadow/crm.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/crmsh' +begin + require 'puppet_x/voxpupuli/corosync/provider/crmsh' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/crmsh' +end Puppet::Type.type(:cs_shadow).provide(:crm, parent: PuppetX::Voxpupuli::Corosync::Provider::Crmsh) do commands crm_shadow: 'crm_shadow' diff --git a/lib/puppet/provider/cs_shadow/pcs.rb b/lib/puppet/provider/cs_shadow/pcs.rb index 46042813..e1dc1ba9 100644 --- a/lib/puppet/provider/cs_shadow/pcs.rb +++ b/lib/puppet/provider/cs_shadow/pcs.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider/pcs' +begin + require 'puppet_x/voxpupuli/corosync/provider/pcs' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/pcs' +end Puppet::Type.type(:cs_shadow).provide(:pcs, parent: PuppetX::Voxpupuli::Corosync::Provider::Pcs) do commands crm_shadow: 'crm_shadow' diff --git a/lib/puppet_x/voxpupuli/corosync/provider/cib_helper.rb b/lib/puppet_x/voxpupuli/corosync/provider/cib_helper.rb index b0ce69e0..c800efb8 100644 --- a/lib/puppet_x/voxpupuli/corosync/provider/cib_helper.rb +++ b/lib/puppet_x/voxpupuli/corosync/provider/cib_helper.rb @@ -1,4 +1,11 @@ -require 'puppet_x/voxpupuli/corosync/provider' +begin + require 'puppet_x/voxpupuli/corosync/provider' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider' +end class PuppetX::Voxpupuli::Corosync::Provider::CibHelper < Puppet::Provider # Yep, that's right we are parsing XML...FUN! (It really wasn't that bad) diff --git a/lib/puppet_x/voxpupuli/corosync/provider/crmsh.rb b/lib/puppet_x/voxpupuli/corosync/provider/crmsh.rb index 37615d55..892ad4f9 100644 --- a/lib/puppet_x/voxpupuli/corosync/provider/crmsh.rb +++ b/lib/puppet_x/voxpupuli/corosync/provider/crmsh.rb @@ -1,5 +1,13 @@ -require 'puppet_x/voxpupuli/corosync/provider' -require 'puppet_x/voxpupuli/corosync/provider/cib_helper' +begin + require 'puppet_x/voxpupuli/corosync/provider' + require 'puppet_x/voxpupuli/corosync/provider/cib_helper' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider' + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/cib_helper' +end class PuppetX::Voxpupuli::Corosync::Provider::Crmsh < PuppetX::Voxpupuli::Corosync::Provider::CibHelper # Yep, that's right we are parsing XML...FUN! (It really wasn't that bad) diff --git a/lib/puppet_x/voxpupuli/corosync/provider/pcs.rb b/lib/puppet_x/voxpupuli/corosync/provider/pcs.rb index 4e82dd08..e02c4eed 100644 --- a/lib/puppet_x/voxpupuli/corosync/provider/pcs.rb +++ b/lib/puppet_x/voxpupuli/corosync/provider/pcs.rb @@ -1,5 +1,13 @@ -require 'puppet_x/voxpupuli/corosync/provider' -require 'puppet_x/voxpupuli/corosync/provider/cib_helper' +begin + require 'puppet_x/voxpupuli/corosync/provider' + require 'puppet_x/voxpupuli/corosync/provider/cib_helper' +rescue LoadError + require 'pathname' # WORKAROUND #14073, #7788 and SERVER-973 + corosync = Puppet::Module.find('corosync', Puppet[:environment].to_s) + raise(LoadError, "Unable to find corosync module in modulepath #{Puppet[:basemodulepath] || Puppet[:modulepath]}") unless corosync + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider' + require File.join corosync.path, 'lib/puppet_x/voxpupuli/corosync/provider/cib_helper' +end class PuppetX::Voxpupuli::Corosync::Provider::Pcs < PuppetX::Voxpupuli::Corosync::Provider::CibHelper # Yep, that's right we are parsing XML...FUN! (It really wasn't that bad) diff --git a/metadata.json b/metadata.json index 8e430b0b..79e7e30c 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppet-corosync", - "version": "1.2.1-rc0", + "version": "1.2.1", "author": "voxpupuli", "summary": "This module is a set of manifests and types/providers for quickly setting up highly available clusters using Corosync", "license": "Apache-2.0",