Skip to content

Commit

Permalink
[2.11] Enhancing the Install Demo Configuration Script with a clearer…
Browse files Browse the repository at this point in the history
… message (#3490)

This changes remove the confusing log statement from 2.11 to unblock the build.

- Related to #3489

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
  • Loading branch information
DarshitChanpura authored Oct 7, 2023
1 parent ef1d27c commit 919589c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
10 changes: 8 additions & 2 deletions tools/install_demo_configuration.bat
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
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

0 comments on commit 919589c

Please sign in to comment.