Merge pull request #140 from ClusterLabs/anvil-tools-dev

* Moved up when the reboot happens, when it's needed, avoiding a netw…
main
digimer-bot 4 years ago committed by GitHub
commit a97c5bafef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 14
      tools/anvil-configure-host

@ -1196,6 +1196,13 @@ sub reconfigure_network
}
}
# If we should reset, do so now.
if ($anvil->data->{sys}{reboot})
{
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, key => "log_0631"});
do_reboot($anvil);
}
if ($changes)
{
# Re-read the config
@ -1222,13 +1229,6 @@ sub reconfigure_network
}
}
# If we should reset, do so now.
if ($anvil->data->{sys}{reboot})
{
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, key => "log_0631"});
do_reboot($anvil);
}
# Wait for a DB connection. We'll wait up to 130 seconds, as sometimes it takes a while for the network
# to start routing traffic.
my $wait_until = time + 130;

Loading…
Cancel
Save