Skip to content

Commit

Permalink
Dont get client tool for server proxy containerized and dont disable …
Browse files Browse the repository at this point in the history
…repo for paygo images
  • Loading branch information
maximenoel8 committed Jan 10, 2025
1 parent d362b83 commit cb849aa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 64 deletions.
49 changes: 0 additions & 49 deletions backend_modules/aws/host/combustion

This file was deleted.

17 changes: 2 additions & 15 deletions backend_modules/aws/host/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,10 @@ locals {
second_data_disk_device = split(".", local.provider_settings["instance_type"])[0] == "t2" ? "xvdf" : "nvme2n1"

host_eip = local.provider_settings["public_instance"] && local.provider_settings["instance_with_eip"]? true: false

combustion_images = ["suma-proxy-50-byos"]
combustion = contains(local.combustion_images, var.image)
}

data "template_file" "user_data" {
count = var.quantity > 0 ? var.quantity : 0
template = file("${path.module}/user_data.yaml")
vars = {
image = var.image
Expand All @@ -62,16 +60,6 @@ data "template_file" "user_data" {
}
}

data "template_file" "combustion" {
template = file("${path.module}/combustion")
vars = {
image = var.image
public_instance = local.provider_settings["public_instance"]
mirror_url = var.base_configuration["mirror"]
install_salt_bundle = var.install_salt_bundle
}
}

resource "aws_eip" "host_eip" {
count = local.host_eip ? var.quantity : 0

Expand Down Expand Up @@ -105,8 +93,7 @@ resource "aws_instance" "instance" {
volume_type = "gp3"
}

# user_data = data.template_file.user_data[count.index].rendered
user_data = local.combustion ? data.template_file.combustion.rendered : data.template_file.user_data.rendered
user_data = data.template_file.user_data[count.index].rendered

# WORKAROUND: ephemeral block devices are defined in any case
# they will only be used for instance types that provide them
Expand Down

0 comments on commit cb849aa

Please sign in to comment.