From e282fc2d28f80af98646f2f00fee9d47fafe9463 Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Mon, 3 Feb 2014 15:36:37 +0000 Subject: [PATCH] extract standard_create_resource --- providers/common.rb | 19 +++++++++++++++++++ providers/primitive.rb | 16 +--------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/providers/common.rb b/providers/common.rb index c2253da..cb17821 100644 --- a/providers/common.rb +++ b/providers/common.rb @@ -32,5 +32,24 @@ class Chef @current_cib_object = cib_object init_current_resource end + + def standard_create_resource + cib_object = cib_object_class.from_chef_resource(new_resource) + cmd = cib_object.crm_configure_command + + ::Chef::Log.info "Creating new #{cib_object}" + + execute cmd do + action :nothing + end.run_action(:run) + + if cib_object.exists? + new_resource.updated_by_last_action(true) + ::Chef::Log.info "Successfully configured #{cib_object}" + else + ::Chef::Log.error "Failed to configure #{cib_object}" + end + end + end end diff --git a/providers/primitive.rb b/providers/primitive.rb index 0b8dacc..a736f7f 100644 --- a/providers/primitive.rb +++ b/providers/primitive.rb @@ -92,21 +92,7 @@ def init_current_resource end def create_resource(name) - cib_object = cib_object_class.from_chef_resource(new_resource) - cmd = cib_object.crm_configure_command - - Chef::Log.info "Creating new #{cib_object}" - - execute cmd do - action :nothing - end.run_action(:run) - - if cib_object.exists? - new_resource.updated_by_last_action(true) - Chef::Log.info "Successfully configured #{cib_object}" - else - Chef::Log.error "Failed to configure #{cib_object}" - end + standard_create_resource end def maybe_modify_resource(name)