diff --git a/Anvil/Tools.pm b/Anvil/Tools.pm index 6ec4c1be..266d57e9 100644 --- a/Anvil/Tools.pm +++ b/Anvil/Tools.pm @@ -1261,7 +1261,6 @@ sub _set_paths 'ssh-keygen' => "/usr/bin/ssh-keygen", 'ssh-keyscan' => "/usr/bin/ssh-keyscan", 'stat' => "/usr/bin/stat", - stonith_admin => "/usr/sbin/stonith_admin", storcli64 => "/opt/MegaRAID/storcli/storcli64", strings => "/usr/bin/strings", 'striker-auto-initialize-all' => "/usr/sbin/striker-auto-initialize-all", diff --git a/tools/fence_pacemaker b/tools/fence_pacemaker index 576d90b6..af202975 100755 --- a/tools/fence_pacemaker +++ b/tools/fence_pacemaker @@ -82,7 +82,6 @@ my $conf = { getent => "/usr/bin/getent", logger => "/usr/bin/logger", pcs => "/usr/sbin/pcs", - stonith_admin => "/usr/sbin/stonith_admin", }, }, # The script will set this. @@ -738,7 +737,7 @@ sub kill_target my ($conf) = @_; # Variables - my $shell_call = $conf->{path}{exe}{stonith_admin}." --fence ".$conf->{cluster}{target_node}." --reboot --verbose; RC=\$?; ".$conf->{path}{exe}{crm_error}." \$RC; ".$conf->{path}{exe}{echo}." rc:\$RC"; + my $shell_call = $conf->{path}{exe}{pcs}." stonith fence ".$conf->{cluster}{target_node}."; ".$conf->{path}{exe}{echo}." rc:\$?"; to_log($conf, {message => "Calling: [".$shell_call."]", 'line' => __LINE__, level => 2}); open (my $file_handle, $shell_call." 2>&1 |") or die "Failed to call: [".$shell_call."]. The error was: $!\n"; while(<$file_handle>) diff --git a/tools/unfence_pacemaker b/tools/unfence_pacemaker index 12c4b307..1d26103c 100755 --- a/tools/unfence_pacemaker +++ b/tools/unfence_pacemaker @@ -50,7 +50,6 @@ my $conf = { getent => "/usr/bin/getent", logger => "/usr/bin/logger", pcs => "/usr/sbin/pcs", - stonith_admin => "/usr/sbin/stonith_admin", }, }, # The script will set this.