rename #crm_configure_command to #configure_command
Done for consistency with #reconfigure_command and #delete_command, and also bearing in mind that in future it's conceivable that the configuration command might not always use crm, or might use other commands in conjunction with crm (c.f. #reconfigure_command).
This commit is contained in:
parent
e0869e74f1
commit
34cf2f112c
@ -48,7 +48,7 @@ class Chef
|
||||
|
||||
def standard_create_resource
|
||||
cib_object = cib_object_class.from_chef_resource(new_resource)
|
||||
cmd = cib_object.crm_configure_command
|
||||
cmd = cib_object.configure_command
|
||||
|
||||
::Chef::Log.info "Creating new #{cib_object}"
|
||||
|
||||
|
@ -144,7 +144,7 @@ module Pacemaker
|
||||
.gsub("'") { "\\'" }
|
||||
end
|
||||
|
||||
def crm_configure_command
|
||||
def configure_command
|
||||
"crm configure " + definition_string
|
||||
end
|
||||
|
||||
|
@ -60,7 +60,7 @@ class Pacemaker::Resource::Primitive < Pacemaker::Resource
|
||||
str
|
||||
end
|
||||
|
||||
def crm_configure_command
|
||||
def configure_command
|
||||
args = %w(crm configure primitive)
|
||||
args << [name, agent, params_string, meta_string, op_string]
|
||||
args.join " "
|
||||
|
@ -106,7 +106,7 @@ describe "Chef::Provider::PacemakerPrimitive" do
|
||||
|
||||
provider.run_action :create
|
||||
|
||||
expect(@chef_run).to run_execute(fixture.crm_configure_command)
|
||||
expect(@chef_run).to run_execute(fixture.configure_command)
|
||||
expect(@resource).to be_updated
|
||||
end
|
||||
|
||||
@ -116,7 +116,7 @@ describe "Chef::Provider::PacemakerPrimitive" do
|
||||
expect { provider.run_action :create }.to \
|
||||
raise_error(RuntimeError, "Failed to create #{fixture}")
|
||||
|
||||
expect(@chef_run).to run_execute(fixture.crm_configure_command)
|
||||
expect(@chef_run).to run_execute(fixture.configure_command)
|
||||
expect(@resource).not_to be_updated
|
||||
end
|
||||
|
||||
@ -128,7 +128,7 @@ describe "Chef::Provider::PacemakerPrimitive" do
|
||||
expect { provider.run_action :create }.to \
|
||||
raise_error(RuntimeError, "Failed to create #{fixture}")
|
||||
|
||||
expect(@chef_run).to run_execute(fixture.crm_configure_command)
|
||||
expect(@chef_run).to run_execute(fixture.configure_command)
|
||||
expect(@resource).not_to be_updated
|
||||
end
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user