diff --git a/libraries/chef/mixin/pacemaker/standard_cib_object.rb b/libraries/chef/mixin/pacemaker/standard_cib_object.rb index 7795e7e..26bc409 100644 --- a/libraries/chef/mixin/pacemaker/standard_cib_object.rb +++ b/libraries/chef/mixin/pacemaker/standard_cib_object.rb @@ -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}" diff --git a/libraries/pacemaker/cib_object.rb b/libraries/pacemaker/cib_object.rb index 3a930fa..29f3127 100644 --- a/libraries/pacemaker/cib_object.rb +++ b/libraries/pacemaker/cib_object.rb @@ -144,7 +144,7 @@ module Pacemaker .gsub("'") { "\\'" } end - def crm_configure_command + def configure_command "crm configure " + definition_string end diff --git a/libraries/pacemaker/resource/primitive.rb b/libraries/pacemaker/resource/primitive.rb index ec3c8c9..08d0568 100644 --- a/libraries/pacemaker/resource/primitive.rb +++ b/libraries/pacemaker/resource/primitive.rb @@ -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 " " diff --git a/spec/providers/primitive_spec.rb b/spec/providers/primitive_spec.rb index b6cd746..22b8554 100644 --- a/spec/providers/primitive_spec.rb +++ b/spec/providers/primitive_spec.rb @@ -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