Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.11] Enhancing the Install Demo Configuration Script with a clearer message #3490

Merged
merged 3 commits into from
Oct 7, 2023
Merged

[2.11] Enhancing the Install Demo Configuration Script with a clearer message #3490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c116fff
Replaces confusing log with a better error message
DarshitChanpura Oct 6, 2023
86f8f16
Updates echo messages to be more detailed
DarshitChanpura Oct 6, 2023
10bb68f
Fixes missing double quotes
DarshitChanpura Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions tools/install_demo_configuration.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,14 @@ if "%initialAdminPassword%" NEQ "" (
)

if not defined ADMIN_PASSWORD (
echo Unable to find the admin password for the cluster. Please set initialAdminPassword or create a file %ADMIN_PASSWORD_FILE% with a single line that contains the password.
exit /b 1
REM Commenting this out in favor of: https://github.com/opensearch-project/security/issues/3489
REM echo Unable to find the admin password for the cluster. Please set initialAdminPassword or create a file %ADMIN_PASSWORD_FILE% with a single line that contains the password.
REM exit /b 1
set "ADMIN_PASSWORD=admin"
echo "Unable to find custom admin password. Continuing with the default password for admin."
echo "You can set the custom admin password in one of the following two ways:"
echo "1. Run 'export initialAdminPassword=<your_password>' before script execution."
echo "2. Create a file $ADMIN_PASSWORD_FILE with a single line that contains the password."
)

echo " ***************************************************"
Expand Down
10 changes: 8 additions & 2 deletions tools/install_demo_configuration.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,14 @@ if [[ -n "$initialAdminPassword" ]]; then
elif [[ -f "$ADMIN_PASSWORD_FILE" && -s "$ADMIN_PASSWORD_FILE" ]]; then
ADMIN_PASSWORD=$(head -n 1 "$ADMIN_PASSWORD_FILE")
else
echo "Unable to find the admin password for the cluster. Please run 'export initialAdminPassword=<your_password>' or create a file $ADMIN_PASSWORD_FILE with a single line that contains the password."
exit 1
# Commenting in favor of: https://github.com/opensearch-project/security/issues/3489
# echo "Unable to find the admin password for the cluster. Please run 'export initialAdminPassword=<your_password>' or create a file $ADMIN_PASSWORD_FILE with a single line that contains the password."
# exit 1
ADMIN_PASSWORD="admin"
echo "Unable to find custom admin password. Continuing with the default password for admin."
echo "You can set the custom admin password in one of the following two ways:"
echo "1. Run 'export initialAdminPassword=<your_password>' before script execution."
echo "2. Create a file $ADMIN_PASSWORD_FILE with a single line that contains the password."
fi

echo " ***************************************************"
Expand Down
Loading