From 247e5f788bd4da9b08618c6ecc4efeeab3482c34 Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Tue, 4 Feb 2014 19:08:08 +0000 Subject: [PATCH] remove broken mixing in of load_current_resource load_current_resource falls victim to pitfall no.1 of mixins :-( http://definingterms.com/2013/03/23/pitfalls-of-ruby-mixins/ --- providers/colocation.rb | 4 ++++ providers/common.rb | 2 +- providers/primitive.rb | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/providers/colocation.rb b/providers/colocation.rb index b69a39f..9c627c8 100644 --- a/providers/colocation.rb +++ b/providers/colocation.rb @@ -47,6 +47,10 @@ def cib_object_class Pacemaker::Constraint::Colocation end +def load_current_resource + standard_load_current_resource +end + def init_current_resource name = @new_resource.name @current_resource = Chef::Resource::PacemakerColocation.new(name) diff --git a/providers/common.rb b/providers/common.rb index 1d5643c..2421c71 100644 --- a/providers/common.rb +++ b/providers/common.rb @@ -9,7 +9,7 @@ class Chef # create / delete / modify as necessary. # # http://docs.opscode.com/lwrp_custom_provider_ruby.html#load-current-resource - def load_current_resource + def standard_load_current_resource name = @new_resource.name cib_object = Pacemaker::CIBObject.from_name(name) diff --git a/providers/primitive.rb b/providers/primitive.rb index f36a26f..89c1d74 100644 --- a/providers/primitive.rb +++ b/providers/primitive.rb @@ -84,6 +84,10 @@ def cib_object_class Pacemaker::Resource::Primitive end +def load_current_resource + standard_load_current_resource +end + def init_current_resource name = @new_resource.name @current_resource = Chef::Resource::PacemakerPrimitive.new(name)