"crm configure show foo" exits 0 with no output if foo doesn't exist
This commit is contained in:
@@ -18,7 +18,8 @@ module Chef::Libraries
|
|||||||
end
|
end
|
||||||
|
|
||||||
def cib_object_exists?(name)
|
def cib_object_exists?(name)
|
||||||
! get_cib_object_definition(name).nil?
|
dfn = get_cib_object_definition(name)
|
||||||
|
!! (dfn && ! dfn.empty?)
|
||||||
end
|
end
|
||||||
|
|
||||||
def cib_object_type(obj_definition)
|
def cib_object_type(obj_definition)
|
||||||
|
@@ -78,11 +78,8 @@ def load_current_resource
|
|||||||
name = @new_resource.name
|
name = @new_resource.name
|
||||||
|
|
||||||
obj_definition = get_cib_object_definition(name)
|
obj_definition = get_cib_object_definition(name)
|
||||||
return unless obj_definition
|
return if ! obj_definition or obj_definition.empty?
|
||||||
|
Chef::Log.debug "CIB object definition #{obj_definition}"
|
||||||
if obj_definition.empty? # probably overly paranoid
|
|
||||||
raise "CIB object '#{name}' existed but definition was empty?!"
|
|
||||||
end
|
|
||||||
|
|
||||||
unless obj_definition =~ /\Aprimitive #{name} (\S+)/
|
unless obj_definition =~ /\Aprimitive #{name} (\S+)/
|
||||||
Chef::Log.warn "Resource '#{name}' was not a primitive"
|
Chef::Log.warn "Resource '#{name}' was not a primitive"
|
||||||
|
@@ -54,8 +54,7 @@ describe "Chef::Provider::PacemakerPrimitive" do
|
|||||||
|
|
||||||
# get_cib_object_definition is invoked by load_current_resource
|
# get_cib_object_definition is invoked by load_current_resource
|
||||||
# and later used to see whether to create or modify.
|
# and later used to see whether to create or modify.
|
||||||
expect(provider).to receive(:get_cib_object_definition).and_return(nil)
|
expect(provider).to receive(:get_cib_object_definition).and_return("")
|
||||||
|
|
||||||
|
|
||||||
# Later, the :create action calls cib_object_exists? to check
|
# Later, the :create action calls cib_object_exists? to check
|
||||||
# that creation succeeded.
|
# that creation succeeded.
|
||||||
|
Reference in New Issue
Block a user