From af5df04b61078758fccb02735643b51b51a45680 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Mon, 19 Oct 2020 17:54:38 +0200 Subject: [PATCH] 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 --- lib/puppet/provider/pcmk_bundle/default.rb | 2 +- lib/puppet/provider/pcmk_common.rb | 2 +- lib/puppet/provider/pcmk_remote/default.rb | 2 +- lib/puppet/provider/pcmk_resource/default.rb | 2 +- lib/puppet/provider/pcmk_stonith/default.rb | 2 +- lib/puppet/type/pcmk_bundle.rb | 2 +- lib/puppet/type/pcmk_resource.rb | 2 +- lib/puppet/type/pcmk_resource_default.rb | 2 +- lib/puppet/type/pcmk_resource_op_default.rb | 2 +- lib/puppet/type/pcmk_stonith.rb | 2 +- lib/puppet/type/pcmk_stonith_level.rb | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/puppet/provider/pcmk_bundle/default.rb b/lib/puppet/provider/pcmk_bundle/default.rb index b7a2cc5b..420a0e23 100644 --- a/lib/puppet/provider/pcmk_bundle/default.rb +++ b/lib/puppet/provider/pcmk_bundle/default.rb @@ -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 diff --git a/lib/puppet/provider/pcmk_common.rb b/lib/puppet/provider/pcmk_common.rb index 3856eaa8..e54baf9c 100644 --- a/lib/puppet/provider/pcmk_common.rb +++ b/lib/puppet/provider/pcmk_common.rb @@ -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 diff --git a/lib/puppet/provider/pcmk_remote/default.rb b/lib/puppet/provider/pcmk_remote/default.rb index c30dacf4..3109c3b8 100644 --- a/lib/puppet/provider/pcmk_remote/default.rb +++ b/lib/puppet/provider/pcmk_remote/default.rb @@ -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 diff --git a/lib/puppet/provider/pcmk_resource/default.rb b/lib/puppet/provider/pcmk_resource/default.rb index b07183eb..d90c9b3b 100644 --- a/lib/puppet/provider/pcmk_resource/default.rb +++ b/lib/puppet/provider/pcmk_resource/default.rb @@ -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 diff --git a/lib/puppet/provider/pcmk_stonith/default.rb b/lib/puppet/provider/pcmk_stonith/default.rb index a822cb71..18b1f992 100644 --- a/lib/puppet/provider/pcmk_stonith/default.rb +++ b/lib/puppet/provider/pcmk_stonith/default.rb @@ -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 diff --git a/lib/puppet/type/pcmk_bundle.rb b/lib/puppet/type/pcmk_bundle.rb index 06763f3b..c96d00ca 100644 --- a/lib/puppet/type/pcmk_bundle.rb +++ b/lib/puppet/type/pcmk_bundle.rb @@ -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`." diff --git a/lib/puppet/type/pcmk_resource.rb b/lib/puppet/type/pcmk_resource.rb index eb917672..2cc847d2 100644 --- a/lib/puppet/type/pcmk_resource.rb +++ b/lib/puppet/type/pcmk_resource.rb @@ -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`." diff --git a/lib/puppet/type/pcmk_resource_default.rb b/lib/puppet/type/pcmk_resource_default.rb index 3d3c160c..c59c5694 100644 --- a/lib/puppet/type/pcmk_resource_default.rb +++ b/lib/puppet/type/pcmk_resource_default.rb @@ -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`." diff --git a/lib/puppet/type/pcmk_resource_op_default.rb b/lib/puppet/type/pcmk_resource_op_default.rb index f0fec192..ed1935bf 100644 --- a/lib/puppet/type/pcmk_resource_op_default.rb +++ b/lib/puppet/type/pcmk_resource_op_default.rb @@ -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`." diff --git a/lib/puppet/type/pcmk_stonith.rb b/lib/puppet/type/pcmk_stonith.rb index 3f1db356..8caff568 100644 --- a/lib/puppet/type/pcmk_stonith.rb +++ b/lib/puppet/type/pcmk_stonith.rb @@ -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`." diff --git a/lib/puppet/type/pcmk_stonith_level.rb b/lib/puppet/type/pcmk_stonith_level.rb index ac69073f..89d46016 100644 --- a/lib/puppet/type/pcmk_stonith_level.rb +++ b/lib/puppet/type/pcmk_stonith_level.rb @@ -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`."