seasharp
/
anvil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #633 from ClusterLabs/stonith-fixes

Browse Source 
Stonith fixes
main
Digimer 9 months ago committed by GitHub
parent 083c26262b 259febeb5c
commit b3fbba8b49
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 287 additions and 271 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 87
      Anvil/Tools/Cluster.pm
  2. 82
      Anvil/Tools/Convert.pm
  3. 1
      Anvil/Tools/Get.pm
  4. 191
      Anvil/Tools/System.pm
  5. 3
      share/words.xml
  6. 50
      tools/anvil-join-anvil
  7. 24
      tools/striker-collect-debug
  8. 2
      tools/striker-get-screenshots

87
Anvil/Tools/Cluster.pm
Unescape View File

@ -1129,11 +1129,9 @@ sub check_stonith_config
# Now I know what I have, lets see what I should have. # Now I know what I have, lets see what I should have.
my $host_name = $anvil->Get->host_name; my $host_name = $anvil->Get->host_name;
my $new_password = $anvil->data->{anvils}{anvil_uuid}{$anvil_uuid}{anvil_password}; my $new_password = $anvil->data->{anvils}{anvil_uuid}{$anvil_uuid}{anvil_password};
my $escaped_password = shell_quote($new_password);
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
host_name => $host_name, host_name => $host_name,
new_password => $anvil->Log->is_secure($new_password), new_password => $anvil->Log->is_secure($new_password),
escaped_password => $anvil->Log->is_secure($escaped_password),
}}); }});
$anvil->data->{machine}{node1}{host_name} = ""; $anvil->data->{machine}{node1}{host_name} = "";
@ -1184,9 +1182,6 @@ sub check_stonith_config
# This will store the fence level order. If something changes # This will store the fence level order. If something changes
$fence_order->{$node_name} = []; $fence_order->{$node_name} = [];
# This will switch to '1' if something changed, triggering a reconfig of the fencing levels.
$something_changed->{$node_name} = 0;
# Does this stonith method already exist? # Does this stonith method already exist?
my $create_entry = 0; my $create_entry = 0;
my $delete_old = 0; my $delete_old = 0;
@ -1352,9 +1347,6 @@ sub check_stonith_config
}}); }});
return(1); return(1);
} }
$something_changed->{$node_name} = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { "something_changed->{$node_name}" => $something_changed->{$node_name} }});
} }
if ($create_entry) if ($create_entry)
{ {
@ -1379,12 +1371,8 @@ sub check_stonith_config
}}); }});
return(1); return(1);
} }
$something_changed->{$node_name} = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { "something_changed->{$node_name}" => $something_changed->{$node_name} }});
} }
### Now any other fence devices. ### Now any other fence devices.
foreach my $device (sort {$a cmp $b} keys %{$anvil->data->{manifests}{manifest_uuid}{$manifest_uuid}{parsed}{machine}{$node}{fence}}) foreach my $device (sort {$a cmp $b} keys %{$anvil->data->{manifests}{manifest_uuid}{$manifest_uuid}{parsed}{machine}{$node}{fence}})
{ {
@ -1592,9 +1580,6 @@ sub check_stonith_config
}}); }});
return(1); return(1);
} }
$something_changed->{$node_name} = 1 if not $delete_old;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { "something_changed->{$node_name}" => $something_changed->{$node_name} }});
} }
if (($create_entry) && (not $dont_create)) if (($create_entry) && (not $dont_create))
{ {
@ -1619,9 +1604,6 @@ sub check_stonith_config
}}); }});
return(1); return(1);
} }
$something_changed->{$node_name} = 1 if not $delete_old;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { "something_changed->{$node_name}" => $something_changed->{$node_name} }});
} }
} }
@ -1663,45 +1645,74 @@ sub check_stonith_config
# Setup fence levels. # Setup fence levels.
foreach my $node_name (sort {$a cmp $b} keys %{$fence_order}) foreach my $node_name (sort {$a cmp $b} keys %{$fence_order})
{
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { "something_changed->{$node_name}" => $something_changed->{$node_name} }});
if ($something_changed->{$node_name})
{ {
# Update our view of the cluster. # Update our view of the cluster.
my $problem = $anvil->Cluster->parse_cib({debug => 2}); my $problem = $anvil->Cluster->parse_cib({debug => 2});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { problem => $problem }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { problem => $problem }});
# Delete any existing fence levels # Check our current levels and update if needed.
if (exists $anvil->data->{cib}{parsed}{data}{node}{$node_name}) my $index = 1;
foreach my $fence_agent (@{$fence_order->{$node_name}})
{
my $key_name = "fl-".$node_name."-".$index;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
fence_agent => $fence_agent,
key_name => $key_name,
}});
# Does the fence level exist, and is it for the right fence agent?
if (exists $anvil->data->{cib}{parsed}{configuration}{'fencing-topology'}{'fencing-level'}{$key_name})
{ {
foreach my $index (sort {$a cmp $b} keys %{$anvil->data->{cib}{parsed}{data}{node}{$node_name}{fencing}{order}}) # If there's multiple fence devices in this method, crop off the extra ones.
my $old_fence_name = $anvil->data->{cib}{parsed}{configuration}{'fencing-topology'}{'fencing-level'}{$key_name}{devices};
$old_fence_name =~ s/,.*//;
my $old_fence_agent = exists $anvil->data->{crm_mon}{parsed}{'pacemaker-result'}{resources}{stonith}{$old_fence_name} ?
$anvil->data->{crm_mon}{parsed}{'pacemaker-result'}{resources}{stonith}{$old_fence_name}{variables}{resource_agent} : "";
$old_fence_agent =~ s/^stonith://;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
old_fence_name => $old_fence_name,
old_fence_agent => $old_fence_agent,
}});
if ($fence_agent eq $old_fence_agent)
{ {
# pcs stonith level delete <index> <target> # The fence level exists and it's the same fence agent, nothing to do.
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0848"});
$index++;
next;
}
else
{
# The fence level exists, but it's for a different fence agent, deleting it
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "log_0849", variables => {
old_fence_name => $old_fence_name,
old_fence_agent => $old_fence_agent,
}});
my $shell_call = $anvil->data->{path}{exe}{pcs}." stonith level delete ".$index." ".$node_name; my $shell_call = $anvil->data->{path}{exe}{pcs}." stonith level delete ".$index." ".$node_name;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { shell_call => $shell_call }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { shell_call => $shell_call }});
my ($output, $return_code) = $anvil->System->call({debug => 3, shell_call => $shell_call}); my ($output, $return_code) = $anvil->System->call({debug => $debug, shell_call => $shell_call});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
output => $output, output => $output,
return_code => $return_code, return_code => $return_code,
}}); }});
if ($return_code) if ($return_code)
{ {
# Something went wrong. # Something went wrong. We'll not exit, but this is probably not going to end well.
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 0, priority => "err", key => "error_0138", variables => { $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 0, priority => "err", key => "error_0138", variables => {
shell_call => $shell_call, shell_call => $shell_call,
output => $output, output => $output,
return_code => $return_code, return_code => $return_code,
}}); }});
return(1);
} }
} }
} }
else
# Create the new fence levels
my $i = 1;
foreach my $fence_agent (@{$fence_order->{$node_name}})
{ {
# The fence level doesn't exist.
}
# Create the fence level now.
my $devices = ""; my $devices = "";
foreach my $device (sort {$a cmp $b} @{$fence_devices->{$node_name}{$fence_agent}}) foreach my $device (sort {$a cmp $b} @{$fence_devices->{$node_name}{$fence_agent}})
{ {
@ -1709,9 +1720,13 @@ sub check_stonith_config
$devices .= $device.","; $devices .= $device.",";
} }
$devices =~ s/,$//; $devices =~ s/,$//;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { devices => $devices }}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "log_0850", variables => {
key_name => $key_name,
fence_agent => $fence_agent,
devices => $devices,
}});
my $shell_call = $anvil->data->{path}{exe}{pcs}." stonith level add ".$i." ".$node_name." ".$devices; my $shell_call = $anvil->data->{path}{exe}{pcs}." stonith level add ".$index." ".$node_name." ".$devices;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { shell_call => $shell_call }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { shell_call => $shell_call }});
my ($output, $return_code) = $anvil->System->call({debug => 3, shell_call => $shell_call}); my ($output, $return_code) = $anvil->System->call({debug => 3, shell_call => $shell_call});
@ -1730,11 +1745,9 @@ sub check_stonith_config
return(1); return(1);
} }
$i++; $index++;
} }
} }
}
return(0); return(0);
} }

82
Anvil/Tools/Convert.pm
Unescape View File

@ -21,6 +21,7 @@ my $THIS_FILE = "Convert.pm";
# format_mmddyy_to_yymmdd # format_mmddyy_to_yymmdd
# host_name_to_ip # host_name_to_ip
# human_readable_to_bytes # human_readable_to_bytes
# to_ipmi_password
# round # round
# time # time
@ -1190,6 +1191,87 @@ sub human_readable_to_bytes
} }
=head2 to_ipmi_password
This takes a password (a string) and returns it in a format suitable for use by most any IPMI BMC. More specifically, spaces are removed, special characters are removed, and it is shortened to 16 characters.
If no password is given, a password will be generated.
parameters;
=head3 password (required)
This is the string to convert into an IPMI compatible password.
=cut
sub to_ipmi_password
{
my $self = shift;
my $parameter = shift;
my $anvil = $self->parent;
my $debug = defined $parameter->{debug} ? $parameter->{debug} : 3;
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0125", variables => { method => "Convert->to_ipmi_password()" }});
# Setup my numbers.
my $password = $parameter->{password} ? $parameter->{password} : 0;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
password => $anvil->Log->is_secure($password),,
}});
if (not $password)
{
$password = $anvil->Get->uuid({debug => $debug});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
password => $anvil->Log->is_secure($password),,
}});
}
my $ipmi_password = $password;
$ipmi_password =~ s/ //g;
$ipmi_password =~ s/'//g;
$ipmi_password =~ s/"//g;
$ipmi_password =~ s/!//g;
$ipmi_password =~ s/#//g;
$ipmi_password =~ s/\$//g;
$ipmi_password =~ s/&//g;
$ipmi_password =~ s/\*//g;
$ipmi_password =~ s/://g;
$ipmi_password =~ s/;//g;
$ipmi_password =~ s/,//g;
$ipmi_password =~ s/`//g;
$ipmi_password =~ s/\|//g;
$ipmi_password =~ s/\^//g;
$ipmi_password =~ s/\?//g;
$ipmi_password =~ s/\\//g;
$ipmi_password =~ s/\(//g;
$ipmi_password =~ s/\)//g;
$ipmi_password =~ s/{//g;
$ipmi_password =~ s/}//g;
$ipmi_password =~ s/<//g;
$ipmi_password =~ s/>//g;
$ipmi_password =~ s/\[//g;
$ipmi_password =~ s/\]//g;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
ipmi_password => $anvil->Log->is_secure($ipmi_password),
}});
# If the length of the password is too short, pad / create it.
if (length($ipmi_password) < 7)
{
$ipmi_password .= "-".$anvil->Get->uuid({debug => $debug, short => 1});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
ipmi_password => $anvil->Log->is_secure($ipmi_password),
}});
}
$ipmi_password = substr($ipmi_password, 0, 16);
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
ipmi_password => $anvil->Log->is_secure($ipmi_password),
}});
return($ipmi_password);
}
=head2 round =head2 round
This takes a number and rounds it to a given number of places after the decimal (defaulting to an even integer). This does financial-type rounding. This takes a number and rounds it to a given number of places after the decimal (defaulting to an even integer). This does financial-type rounding.

1
Anvil/Tools/Get.pm
Unescape View File

@ -12,6 +12,7 @@ use JSON;
use Net::Netmask; use Net::Netmask;
use Text::Diff; use Text::Diff;
use UUID::Tiny qw(:std); use UUID::Tiny qw(:std);
use String::ShellQuote;
our $VERSION = "3.0.0"; our $VERSION = "3.0.0";
my $THIS_FILE = "Get.pm"; my $THIS_FILE = "Get.pm";

191
Anvil/Tools/System.pm
Unescape View File

@ -396,7 +396,7 @@ sub call
else else
{ {
$output .= $line."\n"; $output .= $line."\n";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { output => $output }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { output => $output }});
} }
} }
close $file_handle; close $file_handle;
@ -1989,7 +1989,6 @@ sub configure_ipmi
my $host_uuid = $anvil->Get->host_uuid; my $host_uuid = $anvil->Get->host_uuid;
my $ipmi_ip_address = ""; my $ipmi_ip_address = "";
my $ipmi_password = ""; my $ipmi_password = "";
my $password_length = 0;
my $subnet_mask = ""; my $subnet_mask = "";
my $gateway = ""; my $gateway = "";
my $in_network = ""; my $in_network = "";
@ -2040,12 +2039,10 @@ sub configure_ipmi
# Get the password using the Striker password. # Get the password using the Striker password.
my $db_uuid = $anvil->data->{sys}{database}{read_uuid}; my $db_uuid = $anvil->data->{sys}{database}{read_uuid};
$ipmi_password = $anvil->data->{database}{$db_uuid}{password}; $ipmi_password = $anvil->Convert->to_ipmi_password({password => $anvil->data->{database}{$db_uuid}{password}});
$password_length = length(Encode::encode('UTF-8', $ipmi_password));
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
db_uuid => $db_uuid, db_uuid => $db_uuid,
ipmi_password => $anvil->Log->is_secure($ipmi_password), ipmi_password => $anvil->Log->is_secure($ipmi_password),
password_length => $password_length,
}}); }});
if ((not $anvil->Validate->ipv4({debug => $debug, ip => $ipmi_ip_address})) or (not $ipmi_password)) if ((not $anvil->Validate->ipv4({debug => $debug, ip => $ipmi_ip_address})) or (not $ipmi_password))
@ -2164,24 +2161,25 @@ LIMIT 1
# Make sure the IPMI IP, subnet mask and password are available. # Make sure the IPMI IP, subnet mask and password are available.
$ipmi_ip_address = $anvil->data->{manifests}{manifest_uuid}{$manifest_uuid}{parsed}{machine}{$machine}{ipmi_ip}; $ipmi_ip_address = $anvil->data->{manifests}{manifest_uuid}{$manifest_uuid}{parsed}{machine}{$machine}{ipmi_ip};
$ipmi_password = $anvil->data->{anvils}{anvil_uuid}{$anvil_uuid}{anvil_password}; $ipmi_password = $anvil->Convert->to_ipmi_password({password => $anvil->data->{anvils}{anvil_uuid}{$anvil_uuid}{anvil_password}});
$password_length = length(Encode::encode('UTF-8', $ipmi_password));
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
ipmi_ip_address => $ipmi_ip_address, ipmi_ip_address => $ipmi_ip_address,
ipmi_password => $anvil->Log->is_secure($ipmi_password), ipmi_password => $anvil->Log->is_secure($ipmi_password),
password_length => $password_length,
}}); }});
# Find the subnet the IPMI IP is in. # Find the subnet the IPMI IP is in.
foreach my $network_type ("bcn", "ifn", "sn") foreach my $network_type ("bcn", "ifn", "sn", "mn")
{ {
last if $in_network;
my $count = $anvil->data->{manifests}{manifest_uuid}{$manifest_uuid}{parsed}{networks}{count}{$network_type}; my $count = $anvil->data->{manifests}{manifest_uuid}{$manifest_uuid}{parsed}{networks}{count}{$network_type};
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
network_type => $network_type, network_type => $network_type,
count => $count, count => $count,
in_network => $in_network,
}}); }});
foreach my $i (1..$count) foreach my $i (1..$count)
{ {
last if $in_network;
my $network_name = $network_type.$i; my $network_name = $network_type.$i;
my $network = $anvil->data->{manifests}{manifest_uuid}{$manifest_uuid}{parsed}{networks}{name}{$network_name}{network}; my $network = $anvil->data->{manifests}{manifest_uuid}{$manifest_uuid}{parsed}{networks}{name}{$network_name}{network};
my $this_subnet_mask = $anvil->data->{manifests}{manifest_uuid}{$manifest_uuid}{parsed}{networks}{name}{$network_name}{subnet}; my $this_subnet_mask = $anvil->data->{manifests}{manifest_uuid}{$manifest_uuid}{parsed}{networks}{name}{$network_name}{subnet};
@ -2225,18 +2223,6 @@ LIMIT 1
} }
} }
# If the password has spaces, some IPMI BMCs won't allow them. If we need to use it, we'll take out
# the spaces and shrink the length.
my $ipmi_no_space_password = "";
if ($ipmi_password =~ /\s/)
{
$ipmi_no_space_password = $ipmi_password;
$ipmi_no_space_password =~ s/\s//g;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, secure => 1, list => { ipmi_no_space_password => $ipmi_no_space_password }});
}
# Call dmidecode to see if there even is an IPMI BMC on this host. # Call dmidecode to see if there even is an IPMI BMC on this host.
my $host_ipmi = ""; my $host_ipmi = "";
my $has_ipmi = 0; my $has_ipmi = 0;
@ -2344,6 +2330,16 @@ LIMIT 1
{ {
$current_ip_address = $1; $current_ip_address = $1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { current_ip_address => $current_ip_address }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { current_ip_address => $current_ip_address }});
### TODO: Delete this once simengine can set IP and report the
### correct IP.
# If the config is "Unknown (0x1291)", this is simengine. Don't
# configure, but act like we confirmed the IP.
if ($manufacturer =~ /Unknown \(0x1291\)/i)
{
$current_ip_address = $ipmi_ip_address;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { current_ip_address => $current_ip_address }});
}
} }
# Subnet Mask : 0.0.0.0 # Subnet Mask : 0.0.0.0
# Subnet Mask : 255.255.0.0 # Subnet Mask : 255.255.0.0
@ -2575,7 +2571,6 @@ LIMIT 1
# These need LAN Plus # These need LAN Plus
$lanplus = "yes-no" $lanplus = "yes-no"
} }
my $try_again = 1;
$host_ipmi = $anvil->System->test_ipmi({ $host_ipmi = $anvil->System->test_ipmi({
debug => $debug, debug => $debug,
ipmi_user => $user_name, ipmi_user => $user_name,
@ -2600,135 +2595,21 @@ LIMIT 1
host_uuid => $host_uuid, host_uuid => $host_uuid,
host_status => $anvil->data->{hosts}{host_uuid}{$host_uuid}{host_status}, host_status => $anvil->data->{hosts}{host_uuid}{$host_uuid}{host_status},
}); });
$try_again = 0;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { try_again => $try_again }});
} }
else else
{ {
# Try it again from the dashboard, we may just not be able to talk to our own BMC (can happen # Set the password and try again.
# on shared interfaces) my ($output, $return_code) = $anvil->System->call({debug => $debug, secure => 1, shell_call => $anvil->data->{path}{exe}{ipmitool}." user set password ".$user_number." ".$ipmi_password});
$host_ipmi = $anvil->System->test_ipmi({
debug => $debug,
ipmi_user => $user_name,
ipmi_password => $ipmi_password,
ipmi_target => $ipmi_ip_address,
lanplus => $lanplus,
target => $striker_host,
password => $striker_password,
});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, secure => 1, list => { host_ipmi => $host_ipmi}});
if (($host_ipmi) && ($host_ipmi ne "!!error!!"))
{
# We're good!
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0512"});
# Update the database, in case needed.
my $host_uuid = $anvil->Get->host_uuid();
$anvil->Database->insert_or_update_hosts({
debug => $debug,
host_ipmi => $host_ipmi,
host_key => $anvil->data->{hosts}{host_uuid}{$host_uuid}{host_key},
host_name => $anvil->data->{hosts}{host_uuid}{$host_uuid}{host_name},
host_type => $anvil->data->{hosts}{host_uuid}{$host_uuid}{host_type},
host_uuid => $host_uuid,
host_status => $anvil->data->{hosts}{host_uuid}{$host_uuid}{host_status},
});
$try_again = 0;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { try_again => $try_again }});
}
else
{
# If we used the no-space password, set it as the ipmi_password now.
if ($ipmi_no_space_password)
{
$ipmi_password = $ipmi_no_space_password;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, secure => 1, list => { ipmi_password => $ipmi_password }});
}
# Change the password and then try again.
my $escaped_ipmi_password = shell_quote($ipmi_password);
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, secure => 1, list => { escaped_ipmi_password => $escaped_ipmi_password }});
my ($output, $return_code) = $anvil->System->call({debug => $debug, secure => 1, shell_call => $anvil->data->{path}{exe}{ipmitool}." user set password ".$user_number." ".$escaped_ipmi_password});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
output => $output,
return_code => $return_code,
}});
if (($return_code) or ($output =~ /Password is too long/))
{
# Try again with the 20-byte password.
my $twenty_byte_ipmi_password = $anvil->Words->shorten_string({
debug => $debug,
secure => 1,
string => $ipmi_password,
'length' => 20,
});
my $twenty_byte_escaped_ipmi_password = shell_quote($twenty_byte_ipmi_password);
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, secure => 1, list => {
twenty_byte_ipmi_password => $twenty_byte_ipmi_password,
twenty_byte_escaped_ipmi_password => $twenty_byte_escaped_ipmi_password,
}});
my ($output, $return_code) = $anvil->System->call({debug => $debug, secure => 1, shell_call => $anvil->data->{path}{exe}{ipmitool}." user set password ".$user_number." ".$twenty_byte_escaped_ipmi_password});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
output => $output, output => $output,
return_code => $return_code, return_code => $return_code,
}}); }});
if ($return_code) if (not $return_code)
{
# Try once more with the 16-byte password.
my $sixteen_byte_ipmi_password = $anvil->Words->shorten_string({
debug => $debug,
secure => 1,
string => $ipmi_password,
'length' => 16,
});
my $sixteen_byte_escaped_ipmi_password = shell_quote($sixteen_byte_ipmi_password);
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, secure => 1, list => {
sixteen_byte_ipmi_password => $sixteen_byte_ipmi_password,
sixteen_byte_escaped_ipmi_password => $sixteen_byte_escaped_ipmi_password,
}});
my ($output, $return_code) = $anvil->System->call({debug => $debug, secure => 1, shell_call => $anvil->data->{path}{exe}{ipmitool}." user set password ".$user_number." ".$sixteen_byte_escaped_ipmi_password});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
output => $output,
return_code => $return_code,
}});
if ($return_code)
{
# Nothing more to do.
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "error_0137", variables => {
user_name => $user_name,
user_number => $user_number,
output => $output,
return_code => $return_code,
}});
return('!!error!!');
}
else
{
# Looks like the 16-byte version worked.
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0515"});
}
}
else
{
# Looks like the 20-byte version worked.
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0514"});
}
}
else
{ {
# Looks like the password took. # Looks like the password took.
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0513"}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0513"});
}
}
}
if ($try_again) # Test again
{
$host_ipmi = $anvil->System->test_ipmi({ $host_ipmi = $anvil->System->test_ipmi({
debug => $debug, debug => $debug,
ipmi_user => $user_name, ipmi_user => $user_name,
@ -2739,7 +2620,7 @@ LIMIT 1
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, secure => 1, list => { host_ipmi => $host_ipmi}}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, secure => 1, list => { host_ipmi => $host_ipmi}});
if (($host_ipmi) && ($host_ipmi ne "!!error!!")) if (($host_ipmi) && ($host_ipmi ne "!!error!!"))
{ {
# We're good, password was changed! # We're good!
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0511"}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0511"});
# Update the database, in case needed. # Update the database, in case needed.
@ -2754,11 +2635,10 @@ LIMIT 1
host_status => $anvil->data->{hosts}{host_uuid}{$host_uuid}{host_status}, host_status => $anvil->data->{hosts}{host_uuid}{$host_uuid}{host_status},
}); });
} }
else
{ # Try it again from the dashboard, we may just not be able to talk to our own BMC (can happen
# Try it again from the dashboard, we may just not be able to talk to our own BMC ( # on shared interfaces)
# can happen on shared interfaces) $host_ipmi = $anvil->System->test_ipmi({
my $host_ipmi = $anvil->System->test_ipmi({
debug => $debug, debug => $debug,
ipmi_user => $user_name, ipmi_user => $user_name,
ipmi_password => $ipmi_password, ipmi_password => $ipmi_password,
@ -2771,7 +2651,7 @@ LIMIT 1
if (($host_ipmi) && ($host_ipmi ne "!!error!!")) if (($host_ipmi) && ($host_ipmi ne "!!error!!"))
{ {
# We're good! # We're good!
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0511"}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => $debug, key => "log_0512"});
# Update the database, in case needed. # Update the database, in case needed.
my $host_uuid = $anvil->Get->host_uuid(); my $host_uuid = $anvil->Get->host_uuid();
@ -2787,14 +2667,27 @@ LIMIT 1
} }
else else
{ {
# Nothing worked. :( # Nothing more to do.
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "error_0138", variables => { $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "error_0137", variables => {
user_name => $user_name, user_name => $user_name,
user_number => $user_number, user_number => $user_number,
output => $output,
return_code => $return_code,
}}); }});
return('!!error!!'); return('!!error!!');
} }
} }
else
{
# Failed to set thec password
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "error_0137", variables => {
user_name => $user_name,
user_number => $user_number,
output => $output,
return_code => $return_code,
}});
return('!!error!!');
}
} }
# Re-read the hosts so that it's updated. # Re-read the hosts so that it's updated.

3
share/words.xml
Unescape View File

@ -2731,6 +2731,9 @@ The file: [#!variable!file!#] needs to be updated. The difference is:
<key name="log_0845">No interfaces found configured for the bond: [#!variable!bond_name!#], ignoring it.</key> <key name="log_0845">No interfaces found configured for the bond: [#!variable!bond_name!#], ignoring it.</key>
<key name="log_0846">CPU Load Average: [#!variable!one_minute!# / #!variable!five_minutes!# / #!variable!ten_minutes!#], io wait: [#!variable!iowait!#%], running/blocked processes: [#!variable!running!# / #!variable!blocked!#]</key> <key name="log_0846">CPU Load Average: [#!variable!one_minute!# / #!variable!five_minutes!# / #!variable!ten_minutes!#], io wait: [#!variable!iowait!#%], running/blocked processes: [#!variable!running!# / #!variable!blocked!#]</key>
<key name="log_0847">Times out waiting for the bonds to come up. We waited: [#!variable!waited!#] seconds.</key> <key name="log_0847">Times out waiting for the bonds to come up. We waited: [#!variable!waited!#] seconds.</key>
<key name="log_0848">The fence level exists and it's the same fence agent, nothing to do.</key>
<key name="log_0849">The fence level exists, but it's for the fence name: [#!variable!old_fence_name!#], agent: [#!variable!old_fence_agent!#], deleting it.</key>
<key name="log_0850">Creating the fence level: [#!variable!key_name!#] for the agent: [#!variable!fence_agent!#] using the device(s): [#!variable!devices!#]</key>
<!-- Messages for users (less technical than log entries), though sometimes used for logs, too. --> <!-- Messages for users (less technical than log entries), though sometimes used for logs, too. -->
<key name="message_0001">The host name: [#!variable!target!#] does not resolve to an IP address.</key> <key name="message_0001">The host name: [#!variable!target!#] does not resolve to an IP address.</key>

50
tools/anvil-join-anvil
Unescape View File

@ -650,18 +650,18 @@ sub configure_pacemaker
# joining the cluster ourselves. # joining the cluster ourselves.
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0108"}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0108"});
$start_time = time + 120; $start_time = time + 120;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { start_time => $start_time }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { start_time => $start_time }});
} }
elsif ((time > $start_time) && (not $tried_starting)) elsif ((time > $start_time) && (not $tried_starting))
{ {
# We've waited a minute, time to try starting the cluster. # We've waited a minute, time to try starting the cluster.
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0106"}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0106"});
my $cluster_started = $anvil->Cluster->start_cluster({debug => 2, all => 1}); my $cluster_started = $anvil->Cluster->start_cluster({debug => 2, all => 1});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { cluster_started => $cluster_started }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { cluster_started => $cluster_started }});
# Mark that weve tried to start. # Mark that weve tried to start.
$tried_starting = 1; $tried_starting = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { tried_starting => $tried_starting }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { tried_starting => $tried_starting }});
} }
my $problem = $anvil->Cluster->parse_cib({debug => 2}); my $problem = $anvil->Cluster->parse_cib({debug => 2});
@ -678,7 +678,7 @@ sub configure_pacemaker
if (($node1_ready) && ($node2_ready)) if (($node1_ready) && ($node2_ready))
{ {
$both_online = 1; $both_online = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { both_online => $both_online }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { both_online => $both_online }});
update_progress($anvil, ($anvil->data->{job}{progress} += 2), "job_0104"); update_progress($anvil, ($anvil->data->{job}{progress} += 2), "job_0104");
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0104"}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0104"});
@ -779,7 +779,7 @@ sub configure_pacemaker
} }
# If we can parse the CIB, then pcsd is running. # If we can parse the CIB, then pcsd is running.
my $problem = $anvil->Cluster->parse_cib({debug => 3}); my $problem = $anvil->Cluster->parse_cib({debug => 2});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { problem => $problem }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { problem => $problem }});
if ($problem) if ($problem)
{ {
@ -787,7 +787,7 @@ sub configure_pacemaker
update_progress($anvil, ($anvil->data->{job}{progress} += 2), "job_0102"); update_progress($anvil, ($anvil->data->{job}{progress} += 2), "job_0102");
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0102"}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0102"});
my $cluster_started = $anvil->Cluster->start_cluster({debug => 3, all => 1}); my $cluster_started = $anvil->Cluster->start_cluster({debug => 2, all => 1});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { cluster_started => $cluster_started }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { cluster_started => $cluster_started }});
} }
@ -929,7 +929,7 @@ sub configure_pacemaker
# The --action switch needs to be 'pcmk_off_action' in pcs, so we convert it here. # The --action switch needs to be 'pcmk_off_action' in pcs, so we convert it here.
$host_ipmi =~ s/--action status//; $host_ipmi =~ s/--action status//;
$host_ipmi =~ s/--action/--pcmk_off_action/; $host_ipmi =~ s/--action/--pcmk_off_action/;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
host_ipmi => $host_ipmi =~ /passw/ ? $anvil->Log->is_secure($host_ipmi) : $host_ipmi, host_ipmi => $host_ipmi =~ /passw/ ? $anvil->Log->is_secure($host_ipmi) : $host_ipmi,
}}); }});
@ -937,12 +937,12 @@ sub configure_pacemaker
if ($node eq "node1") if ($node eq "node1")
{ {
$node1_use_delay = 1; $node1_use_delay = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { node1_use_delay => $node1_use_delay }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { node1_use_delay => $node1_use_delay }});
} }
else else
{ {
$node2_use_delay = 1; $node2_use_delay = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { node2_use_delay => $node2_use_delay }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { node2_use_delay => $node2_use_delay }});
} }
# If we're here, break up the command and turn it into the pcs call. # If we're here, break up the command and turn it into the pcs call.
@ -980,12 +980,12 @@ sub configure_pacemaker
# Store this to see if it's different from what's already in the CIB. # Store this to see if it's different from what's already in the CIB.
$old_switches->{$argument} = $value; $old_switches->{$argument} = $value;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
"old_switches->{$argument}" => $old_switches->{$argument}, "old_switches->{$argument}" => $old_switches->{$argument},
}}); }});
} }
$pcs_add_command .= "op monitor interval=\"60\""; $pcs_add_command .= "op monitor interval=\"60\"";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
pcs_add_command => $pcs_add_command =~ /passw/ ? $anvil->Log->is_secure($pcs_add_command) : $pcs_add_command, pcs_add_command => $pcs_add_command =~ /passw/ ? $anvil->Log->is_secure($pcs_add_command) : $pcs_add_command,
}}); }});
@ -998,7 +998,7 @@ sub configure_pacemaker
next if $argument eq "action"; next if $argument eq "action";
my $old_entry = $anvil->data->{cib}{parsed}{data}{node}{$node_name}{fencing}{device}{$ipmi_stonith_name}{argument}{$argument}{value}; my $old_entry = $anvil->data->{cib}{parsed}{data}{node}{$node_name}{fencing}{device}{$ipmi_stonith_name}{argument}{$argument}{value};
my $new_entry = exists $old_switches->{$argument} ? $old_switches->{$argument} : ""; my $new_entry = exists $old_switches->{$argument} ? $old_switches->{$argument} : "";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
's1:argument' => $argument, 's1:argument' => $argument,
's2:old_entry' => $old_entry, 's2:old_entry' => $old_entry,
's3:new_entry' => $new_entry, 's3:new_entry' => $new_entry,
@ -1009,7 +1009,7 @@ sub configure_pacemaker
# Changed, delete and recreate. # Changed, delete and recreate.
$delete_old = 1; $delete_old = 1;
$create_entry = 1; $create_entry = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
delete_old => $delete_old, delete_old => $delete_old,
create_entry => $create_entry, create_entry => $create_entry,
}}); }});
@ -1025,7 +1025,7 @@ sub configure_pacemaker
# Are there any old switches left? # Are there any old switches left?
my $old_switch_count = keys %{$old_switches}; my $old_switch_count = keys %{$old_switches};
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
delete_old => $delete_old, delete_old => $delete_old,
old_switch_count => $old_switch_count, old_switch_count => $old_switch_count,
}}); }});
@ -1034,7 +1034,7 @@ sub configure_pacemaker
# Delete and recreate. # Delete and recreate.
$delete_old = 1; $delete_old = 1;
$create_entry = 1; $create_entry = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
delete_old => $delete_old, delete_old => $delete_old,
create_entry => $create_entry, create_entry => $create_entry,
}}); }});
@ -1050,7 +1050,7 @@ sub configure_pacemaker
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0116"}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0116"});
$create_entry = 1; $create_entry = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { create_entry => $create_entry }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { create_entry => $create_entry }});
} }
} }
elsif (exists $anvil->data->{cib}{parsed}{data}{node}{$node_name}{fencing}{device}{$ipmi_stonith_name}) elsif (exists $anvil->data->{cib}{parsed}{data}{node}{$node_name}{fencing}{device}{$ipmi_stonith_name})
@ -1058,14 +1058,14 @@ sub configure_pacemaker
# There was an existing fence config, but there's no entry in 'host_ipmi'. # There was an existing fence config, but there's no entry in 'host_ipmi'.
# Remove the stonith entry. # Remove the stonith entry.
$delete_old = 1; $delete_old = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { delete_old => $delete_old }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { delete_old => $delete_old }});
update_progress($anvil, ($anvil->data->{job}{progress} += 2), "job_0118"); update_progress($anvil, ($anvil->data->{job}{progress} += 2), "job_0118");
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0118"}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0118"});
} }
# Process the IPMI entry. # Process the IPMI entry.
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
delete_old => $delete_old, delete_old => $delete_old,
create_entry => $create_entry, create_entry => $create_entry,
}}); }});
@ -1076,10 +1076,10 @@ sub configure_pacemaker
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0119", variables => { device => $ipmi_stonith_name }}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0119", variables => { device => $ipmi_stonith_name }});
my $shell_call = $anvil->data->{path}{exe}{pcs}." stonith delete ".$ipmi_stonith_name; my $shell_call = $anvil->data->{path}{exe}{pcs}." stonith delete ".$ipmi_stonith_name;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { shell_call => $shell_call }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { shell_call => $shell_call }});
my ($output, $return_code) = $anvil->System->call({debug => 3, shell_call => $shell_call}); my ($output, $return_code) = $anvil->System->call({debug => 3, shell_call => $shell_call});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
output => $output, output => $output,
return_code => $return_code, return_code => $return_code,
}}); }});
@ -1097,7 +1097,7 @@ sub configure_pacemaker
} }
$something_changed->{$node_name} = 1; $something_changed->{$node_name} = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { "something_changed->{$node_name}" => $something_changed->{$node_name} }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { "something_changed->{$node_name}" => $something_changed->{$node_name} }});
} }
if ($create_entry) if ($create_entry)
{ {
@ -1106,10 +1106,10 @@ sub configure_pacemaker
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0120", variables => { device => $ipmi_stonith_name }}); $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0120", variables => { device => $ipmi_stonith_name }});
my $shell_call = $pcs_add_command; my $shell_call = $pcs_add_command;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { shell_call => $shell_call }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { shell_call => $shell_call }});
my ($output, $return_code) = $anvil->System->call({debug => 3, shell_call => $shell_call}); my ($output, $return_code) = $anvil->System->call({debug => 3, shell_call => $shell_call});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
output => $output, output => $output,
return_code => $return_code, return_code => $return_code,
}}); }});
@ -1127,7 +1127,7 @@ sub configure_pacemaker
} }
$something_changed->{$node_name} = 1; $something_changed->{$node_name} = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { "something_changed->{$node_name}" => $something_changed->{$node_name} }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { "something_changed->{$node_name}" => $something_changed->{$node_name} }});
} }
@ -1403,7 +1403,7 @@ sub configure_pacemaker
{ {
# Update our view of the cluster. # Update our view of the cluster.
my $problem = $anvil->Cluster->parse_cib({debug => 2}); my $problem = $anvil->Cluster->parse_cib({debug => 2});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { problem => $problem }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { problem => $problem }});
# Delete any existing fence levels # Delete any existing fence levels
if (exists $anvil->data->{cib}{parsed}{data}{node}{$node_name}) if (exists $anvil->data->{cib}{parsed}{data}{node}{$node_name})

24
tools/striker-collect-debug
Unescape View File

@ -612,6 +612,30 @@ sub collect_remote_data
backup => 0, backup => 0,
}); });
} }
print "- Collecting the corosync config... ";
$anvil->Storage->rsync({
debug => 2,
source => "root\@".$anvil->data->{peer}{$short_host_name}{access}{ip}.":/etc/corosync/corosync.conf",
destination => $target_directory."/",
});
$test_file = $target_directory."/corosync.conf";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { test_file => $test_file }});
if (-e $test_file)
{
print "Done.\n";
}
else
{
print "Failed!\n";
print "- For some reason, this file was not collected.\n";
$anvil->Storage->write_file({
file => $test_file,
body => $failed_body,
overwrite => 1,
backup => 0,
});
}
} }
# If this is not a striker, collect definition files. # If this is not a striker, collect definition files.

2
tools/striker-get-screenshots
Unescape View File

@ -484,7 +484,7 @@ sub get_screenshots
mode => "0666", mode => "0666",
binary => 1, binary => 1,
}); });
print "Wrote ppm: [".$ppm_file."]\n"; # print "Wrote ppm: [".$ppm_file."]\n";
# Change the ownership # Change the ownership
$anvil->Storage->change_owner({ $anvil->Storage->change_owner({

Write Preview
Loading…
Cancel
Save