eliminate redundant CIB object instantiation
load_current_resource already instantiates a Pacemaker::CIBObject if one was found on the cluster.
This commit is contained in:
@@ -36,8 +36,7 @@ end
|
|||||||
action :delete do
|
action :delete do
|
||||||
name = new_resource.name
|
name = new_resource.name
|
||||||
next unless @current_resource
|
next unless @current_resource
|
||||||
rsc = cib_object_class.new(name)
|
execute @current_cib_object.delete_command do
|
||||||
execute rsc.delete_command do
|
|
||||||
action :nothing
|
action :nothing
|
||||||
end.run_action(:run)
|
end.run_action(:run)
|
||||||
new_resource.updated_by_last_action(true)
|
new_resource.updated_by_last_action(true)
|
||||||
|
@@ -42,11 +42,10 @@ end
|
|||||||
action :delete do
|
action :delete do
|
||||||
name = new_resource.name
|
name = new_resource.name
|
||||||
next unless @current_resource
|
next unless @current_resource
|
||||||
rsc = cib_object_class.new(name)
|
if @current_cib_object.running?
|
||||||
if rsc.running?
|
|
||||||
raise "Cannot delete running #{@current_cib_object}"
|
raise "Cannot delete running #{@current_cib_object}"
|
||||||
end
|
end
|
||||||
execute rsc.delete_command do
|
execute @current_cib_object.delete_command do
|
||||||
action :nothing
|
action :nothing
|
||||||
end.run_action(:run)
|
end.run_action(:run)
|
||||||
new_resource.updated_by_last_action(true)
|
new_resource.updated_by_last_action(true)
|
||||||
@@ -58,9 +57,8 @@ action :start do
|
|||||||
unless @current_resource
|
unless @current_resource
|
||||||
raise "Cannot start non-existent #{cib_object_class.description} '#{name}'"
|
raise "Cannot start non-existent #{cib_object_class.description} '#{name}'"
|
||||||
end
|
end
|
||||||
rsc = cib_object_class.new(name)
|
next if @current_cib_object.running?
|
||||||
next if rsc.running?
|
execute @current_cib_object.start_command do
|
||||||
execute rsc.start_command do
|
|
||||||
action :nothing
|
action :nothing
|
||||||
end.run_action(:run)
|
end.run_action(:run)
|
||||||
new_resource.updated_by_last_action(true)
|
new_resource.updated_by_last_action(true)
|
||||||
@@ -72,9 +70,8 @@ action :stop do
|
|||||||
unless @current_resource
|
unless @current_resource
|
||||||
raise "Cannot stop non-existent #{cib_object_class.description} '#{name}'"
|
raise "Cannot stop non-existent #{cib_object_class.description} '#{name}'"
|
||||||
end
|
end
|
||||||
rsc = cib_object_class.new(name)
|
next unless @current_cib_object.running?
|
||||||
next unless rsc.running?
|
execute @current_cib_object.stop_command do
|
||||||
execute rsc.stop_command do
|
|
||||||
action :nothing
|
action :nothing
|
||||||
end.run_action(:run)
|
end.run_action(:run)
|
||||||
new_resource.updated_by_last_action(true)
|
new_resource.updated_by_last_action(true)
|
||||||
|
Reference in New Issue
Block a user