From 64bd9c8fb4e6aafbefe005a07ef971ba67a126a4 Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Tue, 4 Mar 2014 16:22:50 +0000 Subject: [PATCH] extract #standard_create_action for reuse --- libraries/chef/mixin/pacemaker/standard_cib_object.rb | 10 ++++++++++ providers/group.rb | 8 +------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libraries/chef/mixin/pacemaker/standard_cib_object.rb b/libraries/chef/mixin/pacemaker/standard_cib_object.rb index 0490d9b..7795e7e 100644 --- a/libraries/chef/mixin/pacemaker/standard_cib_object.rb +++ b/libraries/chef/mixin/pacemaker/standard_cib_object.rb @@ -7,6 +7,16 @@ require ::File.expand_path('../../../pacemaker/cib_object', class Chef module Mixin::Pacemaker module StandardCIBObject + def standard_create_action + name = new_resource.name + + if @current_resource_definition.nil? + create_resource(name) + else + maybe_modify_resource(name) + end + end + # Instantiate @current_resource and read details about the existing # primitive (if any) via "crm configure show" into it, so that we # can compare it against the resource requested by the recipe, and diff --git a/providers/group.rb b/providers/group.rb index c163998..6b3cb2c 100644 --- a/providers/group.rb +++ b/providers/group.rb @@ -23,13 +23,7 @@ require ::File.expand_path('../libraries/chef/mixin/pacemaker', include Chef::Mixin::Pacemaker::RunnableResource action :create do - name = new_resource.name - - if @current_resource_definition.nil? - create_resource(name) - else - maybe_modify_resource(name) - end + standard_create_action end action :delete do