replace 'execute' with 'Mixlib::ShellOut' library.
This commit is contained in:
@@ -33,12 +33,16 @@ action :create do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
e = execute "configure clone #{name}" do
|
cmd_ = Mixlib::ShellOut.new(cmd)
|
||||||
command cmd
|
cmd_.environment['HOME'] = ENV.fetch('HOME', '/root')
|
||||||
|
cmd_.run_command
|
||||||
|
begin
|
||||||
|
cmd.error!
|
||||||
|
new_resource.updated_by_last_action(true)
|
||||||
|
Chef::Log.info "Successfully configured clone '#{name}'."
|
||||||
|
rescue
|
||||||
|
Chef::Log.error "Failed to configure clone #{name}."
|
||||||
end
|
end
|
||||||
|
|
||||||
new_resource.updated_by_last_action(true)
|
|
||||||
Chef::Log.info "configured clone '#{name}'."
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -53,5 +57,4 @@ action :delete do
|
|||||||
|
|
||||||
new_resource.updated_by_last_action(true)
|
new_resource.updated_by_last_action(true)
|
||||||
Chef::Log.info "Deleted clone '#{name}'."
|
Chef::Log.info "Deleted clone '#{name}'."
|
||||||
|
|
||||||
end
|
end
|
||||||
|
@@ -32,24 +32,22 @@ action :create do
|
|||||||
multiple_rscs.each do |rsc|
|
multiple_rscs.each do |rsc|
|
||||||
cmd << " #{rsc}"
|
cmd << " #{rsc}"
|
||||||
end
|
end
|
||||||
|
|
||||||
e = execute "configure colocation #{name}" do
|
|
||||||
command cmd
|
|
||||||
end
|
|
||||||
|
|
||||||
new_resource.updated_by_last_action(true)
|
|
||||||
Chef::Log.info "Configured colocation '#{name}'."
|
|
||||||
else
|
else
|
||||||
rsc = new_resource.rsc
|
rsc = new_resource.rsc
|
||||||
with_rsc = new_resource.with_rsc
|
with_rsc = new_resource.with_rsc
|
||||||
|
|
||||||
cmd = "crm configure colocation #{name} #{priority}: #{rsc} #{with_rsc}"
|
cmd = "crm configure colocation #{name} #{priority}: #{rsc} #{with_rsc}"
|
||||||
e = execute "configure colocation #{name}" do
|
end
|
||||||
command cmd
|
|
||||||
end
|
|
||||||
|
|
||||||
|
cmd_ = Mixlib::ShellOut.new(cmd)
|
||||||
|
cmd_.environment['HOME'] = ENV.fetch('HOME', '/root')
|
||||||
|
cmd_.run_command
|
||||||
|
begin
|
||||||
|
cmd.error!
|
||||||
new_resource.updated_by_last_action(true)
|
new_resource.updated_by_last_action(true)
|
||||||
Chef::Log.info "Configured colocation '#{name}'."
|
Chef::Log.info "Successfully configured colocation '#{name}'."
|
||||||
|
rescue
|
||||||
|
Chef::Log.error "Failed to configure colocation #{name}."
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@@ -28,12 +28,16 @@ action :create do
|
|||||||
unless resource_exists?(name)
|
unless resource_exists?(name)
|
||||||
cmd = "crm configure location #{name} #{rsc} #{priority}: #{loc}"
|
cmd = "crm configure location #{name} #{rsc} #{priority}: #{loc}"
|
||||||
|
|
||||||
e = execute "configure location #{name}" do
|
cmd_ = Mixlib::ShellOut.new(cmd)
|
||||||
command cmd
|
cmd_.environment['HOME'] = ENV.fetch('HOME', '/root')
|
||||||
|
cmd_.run_command
|
||||||
|
begin
|
||||||
|
cmd.error!
|
||||||
|
new_resource.updated_by_last_action(true)
|
||||||
|
Chef::Log.info "Successfully configured location '#{name}'."
|
||||||
|
rescue
|
||||||
|
Chef::Log.error "Failed to configure location #{name}."
|
||||||
end
|
end
|
||||||
|
|
||||||
new_resource.updated_by_last_action(true)
|
|
||||||
Chef::Log.info "Configured location '#{name}'."
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@@ -33,12 +33,16 @@ action :create do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
e = execute "configure ms #{name}" do
|
cmd_ = Mixlib::ShellOut.new(cmd)
|
||||||
command cmd
|
cmd_.environment['HOME'] = ENV.fetch('HOME', '/root')
|
||||||
|
cmd_.run_command
|
||||||
|
begin
|
||||||
|
cmd.error!
|
||||||
|
new_resource.updated_by_last_action(true)
|
||||||
|
Chef::Log.info "Successfully configured ms '#{name}'."
|
||||||
|
rescue
|
||||||
|
Chef::Log.error "Failed to configure ms #{name}."
|
||||||
end
|
end
|
||||||
|
|
||||||
new_resource.updated_by_last_action(true)
|
|
||||||
Chef::Log.info "configured ms '#{name}'."
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@@ -25,12 +25,16 @@ action :add do
|
|||||||
unless resource_exists?(name)
|
unless resource_exists?(name)
|
||||||
cmd = "crm configure node #{name}"
|
cmd = "crm configure node #{name}"
|
||||||
|
|
||||||
e = execute "add node #{name}" do
|
cmd_ = Mixlib::ShellOut.new(cmd)
|
||||||
command cmd
|
cmd_.environment['HOME'] = ENV.fetch('HOME', '/root')
|
||||||
|
cmd_.run_command
|
||||||
|
begin
|
||||||
|
cmd.error!
|
||||||
|
new_resource.updated_by_last_action(true)
|
||||||
|
Chef::Log.info "Successfully configured node '#{name}'."
|
||||||
|
rescue
|
||||||
|
Chef::Log.error "Failed to configure node #{name}."
|
||||||
end
|
end
|
||||||
|
|
||||||
new_resource.updated_by_last_action(true)
|
|
||||||
Chef::Log.info "Node '#{name}' has been added.."
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@@ -25,17 +25,21 @@ action :create do
|
|||||||
resources = new_resource.resources
|
resources = new_resource.resources
|
||||||
|
|
||||||
unless resource_exists?(name)
|
unless resource_exists?(name)
|
||||||
cmd = "crm configure order #{name} #{priority}:"
|
cmd = "crm configure order #{name} #{priority}:"
|
||||||
resources.each do |rsc|
|
resources.each do |rsc|
|
||||||
cmd << " #{rsc}"
|
cmd << " #{rsc}"
|
||||||
end
|
end
|
||||||
|
|
||||||
e = execute "configure order #{name}" do
|
|
||||||
command cmd
|
|
||||||
end
|
|
||||||
|
|
||||||
|
cmd_ = Mixlib::ShellOut.new(cmd)
|
||||||
|
cmd_.environment['HOME'] = ENV.fetch('HOME', '/root')
|
||||||
|
cmd_.run_command
|
||||||
|
begin
|
||||||
|
cmd.error!
|
||||||
new_resource.updated_by_last_action(true)
|
new_resource.updated_by_last_action(true)
|
||||||
Chef::Log.info "Configured order '#{name}'."
|
Chef::Log.info "Successfully configured order '#{name}'."
|
||||||
|
rescue
|
||||||
|
Chef::Log.error "Failed to configure order #{name}."
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@@ -53,18 +53,18 @@ action :create do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
e = execute "configure primitive #{name}" do
|
# 'Execute' resource doesn't throw exception even when command fails..
|
||||||
command cmd
|
# So, Mixlib::ShellOut was used instead.
|
||||||
|
cmd_ = Mixlib::ShellOut.new(cmd)
|
||||||
|
cmd_.environment['HOME'] = ENV.fetch('HOME', '/root')
|
||||||
|
cmd_.run_command
|
||||||
|
begin
|
||||||
|
cmd.error!
|
||||||
|
new_resource.updated_by_last_action(true)
|
||||||
|
Chef::Log.info "Successfully configured primitive '#{name}'."
|
||||||
|
rescue
|
||||||
|
Chef::Log.error "Failed to configure primitive #{name}."
|
||||||
end
|
end
|
||||||
|
|
||||||
# With the below commands, 'e.updated?' is always 'false' even though the execute command ran successfully.
|
|
||||||
# new_resource.updated_by_last_action(e.updated?)
|
|
||||||
# if e.updated?
|
|
||||||
# Chef::Log.info "Done creating primitive '#{name}'."
|
|
||||||
# end
|
|
||||||
|
|
||||||
new_resource.updated_by_last_action(true)
|
|
||||||
Chef::Log.info "Configured primitive '#{name}'."
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user