diff --git a/setup/terraform/manage-instances.sh b/setup/terraform/manage-instances.sh index 89b358a..ed26e8f 100755 --- a/setup/terraform/manage-instances.sh +++ b/setup/terraform/manage-instances.sh @@ -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)" if [[ $ACTION == "list" ]]; then list_instances "$INSTANCE_IDS" diff --git a/setup/terraform/resources/common.sh b/setup/terraform/resources/common.sh index 081d8ab..3d0761d 100644 --- a/setup/terraform/resources/common.sh +++ b/setup/terraform/resources/common.sh @@ -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 + yum_install --enablerepo=epel openssl11 } function resolve_host_addresses() { diff --git a/setup/terraform/resources/setup-ecs.sh b/setup/terraform/resources/setup-ecs.sh index 79b469b..740143b 100644 --- a/setup/terraform/resources/setup-ecs.sh +++ b/setup/terraform/resources/setup-ecs.sh @@ -35,6 +35,17 @@ if [[ $ACTION == "install-prereqs" ]]; then fi deploy_os_prereqs + # Install dependencies on python38 for ECS 1.5.2 + 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"