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

Minor fixes #26

Closed
wants to merge 8 commits into from
Closed

Minor fixes #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fde1e3b
Add ECS instances
Jan 30, 2024
ee66edb
Add openssl11
Jan 30, 2024
9574b0e
Install GO v1.21.5 from tar
Jan 30, 2024
618c95b
Add jdk17 to support CEM 2.x
Jan 30, 2024
5553b6b
Install dependencies on python38 for ECS 1.5.2
Jan 30, 2024
1510fe8
Revert "Add jdk17 to support CEM 2.x"
Mar 20, 2024
1f4c7c6
Merge remote-tracking branch 'upstream/trunk' into trunk
Mar 20, 2024
88fb29a
Merge remote-tracking branch 'upstream/trunk' into trunk
Jun 5, 2024
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
2 changes: 1 addition & 1 deletion setup/terraform/manage-instances.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function list_instances() {
printf "%-12s %-15s %-8s %-40s %s\n" $(echo "State Owner EndDate Name Id"; list_cloud_instances "$instance_ids")
}

INSTANCE_IDS="$(cluster_instances | cluster_attr id) $(web_instance | web_attr id) $(ipa_instance | ipa_attr id)"
INSTANCE_IDS="$(cluster_instances | cluster_attr id) $(web_instance | web_attr id) $(ipa_instance | ipa_attr id) $(ecs_instances | ecs_attr id)"
ylysn marked this conversation as resolved.
Show resolved Hide resolved

if [[ $ACTION == "list" ]]; then
list_instances "$INSTANCE_IDS"
Expand Down
2 changes: 2 additions & 0 deletions setup/terraform/resources/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1365,6 +1365,8 @@ function deploy_cluster_prereqs() {
yum_install nodejs gcc-c++ make shellinabox mosquitto transmission-cli rh-python38 rh-python38-python-devel httpd
# Below is needed for secure clusters (required by Impyla)
yum_install cyrus-sasl-md5 cyrus-sasl-plain cyrus-sasl-gssapi cyrus-sasl-devel
# SSB-LB-UI needs libssl.so.1.1
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ylysn Do you know a way to reproduce the error that led you to add this?
I'm curious what may have caused this, since I never hit this problem.
Which stack(s) were you testing?

yum_install --enablerepo=epel openssl11
}

function resolve_host_addresses() {
Expand Down
11 changes: 11 additions & 0 deletions setup/terraform/resources/setup-ecs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,17 @@ if [[ $ACTION == "install-prereqs" ]]; then
fi

deploy_os_prereqs
# Install dependencies on python38 for ECS 1.5.2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the same set of steps used to install Python 3.8 on the cluster node, right?
Could you make this into a "install_python" function in common.sh and use that same function on both setup.sh and setup-ecs.sh?

It's going to be cleaner and easier to maintain.

yum_install centos-release-scl
yum_install rh-python38 rh-python38-python-devel
# Enable python38 and add yaml
enable_py3
pip install --quiet --upgrade pip pyyaml
rm -f /usr/bin/python3 /usr/bin/pip3 /usr/local/bin/python3.8
ln -s /opt/rh/rh-python38/root/bin/python3 /usr/bin/python3
ln -s /opt/rh/rh-python38/root/bin/pip3 /usr/bin/pip3
ln -s /opt/rh/rh-python38/root/usr/bin/python3.8 /usr/local/bin/python3.8

complete_host_initialization "ecs"

log_status "Ensure domain search list only contains ec2.internal, and not nip.io"
Expand Down