Skip to content

Commit 8475d45

Browse files
authored
Merge pull request #162 from hashicorp/ab-amzlinux-2023
Do firewall setup on amazon linux 2023 as well.
2 parents d3a86ff + 3ef3f29 commit 8475d45

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

modules/tfe_init_replicated/templates/install_packages.func

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ function install_packages {
1616

1717
%{ if distribution == "amazon-linux-2023" ~}
1818
echo "[$(date +"%FT%T")] [Terraform Enterprise] Remove existing docker and install v24 with yum" | tee -a $log_pathname
19-
yum remove docker -y
20-
yum install docker-24.0.5-1.amzn2023.0.3 -y
19+
yum -y remove docker
20+
yum clean packages
21+
yum -y install docker-24.0.5-1.amzn2023.0.3
2122

2223
systemctl start docker
2324
systemctl enable docker

modules/tfe_init_replicated/templates/tfe_replicated.sh.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ $install_pathname \
288288
# -----------------------------------------------------------------------------
289289
# Add docker0 to firewalld (for Red Hat instances only)
290290
# -----------------------------------------------------------------------------
291-
%{ if distribution == "rhel" && cloud != "google" ~}
291+
%{ if distribution == "amazon-linux-2023" || distribution == "rhel" && cloud != "google" ~}
292292
os_release=$(cat /etc/os-release | grep VERSION_ID | sed "s/VERSION_ID=\"\(.*\)\"/\1/g")
293293
if (( $(echo "$os_release < 8.0" | bc -l ) )); then
294294
echo "[$(date +"%FT%T")] [Terraform Enterprise] Disable SELinux (temporary)" | tee -a $log_pathname

0 commit comments

Comments
 (0)