From c5260e4787cd83153dbf5dc0be774e5f1e4706e1 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Thu, 19 Jan 2023 11:25:59 -0500 Subject: [PATCH] verify setup --- setup/so-setup | 4 ++-- setup/so-verify | 12 +++--------- 2 files changed, 5 insertions(+), 11 deletions(-) mode change 100644 => 100755 setup/so-verify diff --git a/setup/so-setup b/setup/so-setup index 80c6372c9..ad4f57d55 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -585,7 +585,7 @@ if ! [[ -f $install_opt_file ]]; then fi checkin_at_boot set_initial_firewall_access - verify_setup $setup_type + so-verify $setup_type else touch /root/accept_changes mkdir -p /opt/so @@ -608,7 +608,7 @@ if ! [[ -f $install_opt_file ]]; then configure_minion "$minion_type" drop_install_options checkin_at_boot - verify_setup $setup_type + so-verify $setup_type fi # Need to make sure the latest install is located on the web server of the manager to check the versions and donwload the code if required diff --git a/setup/so-verify b/setup/so-verify old mode 100644 new mode 100755 index 22947df7e..26581e673 --- a/setup/so-verify +++ b/setup/so-verify @@ -84,19 +84,13 @@ main() { if log_has_errors; then echo "WARNING: Errors detected during setup" exit_code=1 - fi - - if using_iso && cron_error_in_mail_spool; then + elif using_iso && cron_error_in_mail_spool; then echo "WARNING: Unexpected cron job output in mail spool" exit_code=1 - fi - - if is_manager_node && status_failed; then + elif is_manager_node && status_failed; then echo "WARNING: Containers are not in a healthy state" exit_code=1 - fi - - if [[ exit_code -eq 0 ]]; then + else echo "Successfully completed setup!" fi