pcs resource show and pcs stonith show are deprecated
Now that we branched we should try and clean up these old usages. Tested this by deploying a large train composable HA overcloud (with stonith and Instance HA) using puppet-pacemaker from master with this change and everything worked correctly. Test was done on RHEL 8.3 + composable HA + IHA + TLS-E Change-Id: Id8807a644a6d53f89f99b9db988cbbca99abb7ab
This commit is contained in:
parent
942aed4fb2
commit
af5df04b61
|
@ -178,7 +178,7 @@ Puppet::Type.type(:pcmk_bundle).provide(:default) do
|
|||
end
|
||||
|
||||
def resource_exists?
|
||||
cmd = 'resource show ' + @resource[:name] + ' > /dev/null 2>&1'
|
||||
cmd = 'resource config ' + @resource[:name] + ' > /dev/null 2>&1'
|
||||
ret = pcs('show', @resource[:name], cmd, @resource[:tries],
|
||||
@resource[:try_sleep], @resource[:verify_on_create], @resource[:post_success_sleep])
|
||||
if ret == false then
|
||||
|
|
|
@ -191,7 +191,7 @@ def pcs_create_with_verify(name, resource_name, cmd, tries=1, try_sleep=0)
|
|||
pcs_out = `#{PCS_BIN} #{cmd} 2>&1`
|
||||
if $?.exitstatus == 0
|
||||
sleep try_sleep
|
||||
cmd_show = "#{PCS_BIN} resource show " + resource_name
|
||||
cmd_show = "#{PCS_BIN} resource config " + resource_name
|
||||
Puppet.debug("Verifying with: "+cmd_show)
|
||||
`#{cmd_show}`
|
||||
if $?.exitstatus == 0
|
||||
|
|
|
@ -79,7 +79,7 @@ Puppet::Type.type(:pcmk_remote).provide(:default) do
|
|||
end
|
||||
|
||||
def resource_exists?
|
||||
cmd = 'resource show ' + @resource[:name] + ' > /dev/null 2>&1'
|
||||
cmd = 'resource config ' + @resource[:name] + ' > /dev/null 2>&1'
|
||||
ret = pcs('show', @resource[:name], cmd, @resource[:tries],
|
||||
@resource[:try_sleep], false, @resource[:post_success_sleep])
|
||||
if ret == false then
|
||||
|
|
|
@ -159,7 +159,7 @@ Puppet::Type.type(:pcmk_resource).provide(:default) do
|
|||
end
|
||||
|
||||
def resource_exists?
|
||||
cmd = 'resource show ' + @resource[:name] + ' > /dev/null 2>&1'
|
||||
cmd = 'resource config ' + @resource[:name] + ' > /dev/null 2>&1'
|
||||
ret = pcs('show', @resource[:name], cmd, @resource[:tries],
|
||||
@resource[:try_sleep], @resource[:verify_on_create], @resource[:post_success_sleep])
|
||||
if ret == false then
|
||||
|
|
|
@ -103,7 +103,7 @@ Puppet::Type.type(:pcmk_stonith).provide(:default) do
|
|||
end
|
||||
|
||||
def stonith_resource_exists?
|
||||
cmd = 'stonith show ' + @resource[:name] + ' > /dev/null 2>&1'
|
||||
cmd = 'stonith config ' + @resource[:name] + ' > /dev/null 2>&1'
|
||||
ret = pcs('show', @resource[:name], cmd, @resource[:tries],
|
||||
@resource[:try_sleep], @resource[:verify_on_create], @resource[:post_success_sleep])
|
||||
if ret == false then
|
||||
|
|
|
@ -66,7 +66,7 @@ Puppet::Type.newtype(:pcmk_bundle) do
|
|||
|
||||
newparam(:verify_on_create, :boolean => true, :parent => Puppet::Parameter::Boolean) do
|
||||
desc "Whether to verify pcs resource creation with an additional
|
||||
call to 'pcs resource show' rather than just relying on the exit
|
||||
call to 'pcs resource config' rather than just relying on the exit
|
||||
status of 'pcs resource create'. When true, $try_sleep
|
||||
determines how long to wait to verify and $post_success_sleep is
|
||||
ignored. Defaults to `false`."
|
||||
|
|
|
@ -69,7 +69,7 @@ Puppet::Type.newtype(:pcmk_resource) do
|
|||
|
||||
newparam(:verify_on_create, :boolean => true, :parent => Puppet::Parameter::Boolean) do
|
||||
desc "Whether to verify pcs resource creation with an additional
|
||||
call to 'pcs resource show' rather than just relying on the exit
|
||||
call to 'pcs resource config' rather than just relying on the exit
|
||||
status of 'pcs resource create'. When true, $try_sleep
|
||||
determines how long to wait to verify and $post_success_sleep is
|
||||
ignored. Defaults to `false`."
|
||||
|
|
|
@ -70,7 +70,7 @@ Puppet::Type.newtype(:pcmk_resource_default) do
|
|||
|
||||
newparam(:verify_on_create, :boolean => true, :parent => Puppet::Parameter::Boolean) do
|
||||
desc "Whether to verify pcs resource creation with an additional
|
||||
call to 'pcs resource show' rather than just relying on the exit
|
||||
call to 'pcs resource config' rather than just relying on the exit
|
||||
status of 'pcs resource create'. When true, $try_sleep
|
||||
determines how long to wait to verify and $post_success_sleep is
|
||||
ignored. Defaults to `false`."
|
||||
|
|
|
@ -70,7 +70,7 @@ Puppet::Type.newtype(:pcmk_resource_op_default) do
|
|||
|
||||
newparam(:verify_on_create, :boolean => true, :parent => Puppet::Parameter::Boolean) do
|
||||
desc "Whether to verify pcs resource creation with an additional
|
||||
call to 'pcs resource show' rather than just relying on the exit
|
||||
call to 'pcs resource config' rather than just relying on the exit
|
||||
status of 'pcs resource create'. When true, $try_sleep
|
||||
determines how long to wait to verify and $post_success_sleep is
|
||||
ignored. Defaults to `false`."
|
||||
|
|
|
@ -87,7 +87,7 @@ Puppet::Type.newtype(:pcmk_stonith) do
|
|||
|
||||
newparam(:verify_on_create, :boolean => true, :parent => Puppet::Parameter::Boolean) do
|
||||
desc "Whether to verify pcs resource creation with an additional
|
||||
call to 'pcs resource show' rather than just relying on the exit
|
||||
call to 'pcs resource config' rather than just relying on the exit
|
||||
status of 'pcs resource create'. When true, $try_sleep
|
||||
determines how long to wait to verify and $post_success_sleep is
|
||||
ignored. Defaults to `false`."
|
||||
|
|
|
@ -70,7 +70,7 @@ Puppet::Type.newtype(:pcmk_stonith_level) do
|
|||
|
||||
newparam(:verify_on_create, :boolean => true, :parent => Puppet::Parameter::Boolean) do
|
||||
desc "Whether to verify pcs resource creation with an additional
|
||||
call to 'pcs resource show' rather than just relying on the exit
|
||||
call to 'pcs resource config' rather than just relying on the exit
|
||||
status of 'pcs resource create'. When true, $try_sleep
|
||||
determines how long to wait to verify and $post_success_sleep is
|
||||
ignored. Defaults to `false`."
|
||||
|
|
Loading…
Reference in New Issue