diff --git a/enos/enos-modules.hcl b/enos/enos-modules.hcl index 5fc9442533..a1aa485ff2 100644 --- a/enos/enos-modules.hcl +++ b/enos/enos-modules.hcl @@ -68,7 +68,7 @@ module "target_ec2_fleet" { common_tags = var.tags instance_mem_min = 4096 instance_cpu_min = 2 - max_price = "0.1432" // On-demand cost for RHEL/t3.medium on-demand in us-east + max_price = "0.1432" // On-demand cost for RHEL amd64 on t3.medium in us-east project_name = var.project_name ssh_keypair = var.aws_ssh_keypair_name } @@ -79,7 +79,7 @@ module "target_ec2_spot_fleet" { common_tags = var.tags instance_mem_min = 4096 instance_cpu_min = 2 - max_price = "0.1432" // On-demand cost for RHEL/t3.medium on-demand in us-east + max_price = "0.1432" // On-demand cost for RHEL amd64 on t3.medium in us-east project_name = var.project_name ssh_keypair = var.aws_ssh_keypair_name } diff --git a/enos/enos-scenario-agent.hcl b/enos/enos-scenario-agent.hcl index facb253b44..1cda1be038 100644 --- a/enos/enos-scenario-agent.hcl +++ b/enos/enos-scenario-agent.hcl @@ -35,12 +35,7 @@ scenario "agent" { ubuntu = provider.enos.ubuntu } install_artifactory_artifact = local.bundle_path == null - max_price = { - // These prices are based on on-demand cost for t3.large in us-east - "rhel" = "0.1432" - "ubuntu" = "0.0832" - } - packages = ["jq"] + packages = ["jq"] tags = merge({ "Project Name" : var.project_name "Project" : "Enos", @@ -110,7 +105,6 @@ scenario "agent" { awskms_unseal_key_arn = step.create_vpc.kms_key_arn cluster_tag_key = local.vault_tag_key common_tags = local.tags - max_price = local.max_price[matrix.distro] vpc_id = step.create_vpc.vpc_id } } diff --git a/enos/enos-scenario-autopilot.hcl b/enos/enos-scenario-autopilot.hcl index 1095a0f5d5..7f8893b7f6 100644 --- a/enos/enos-scenario-autopilot.hcl +++ b/enos/enos-scenario-autopilot.hcl @@ -47,11 +47,6 @@ scenario "autopilot" { rhel = provider.enos.rhel ubuntu = provider.enos.ubuntu } - max_price = { - // These prices are based on on-demand cost for t3.large in us-east - "rhel" = "0.1432" - "ubuntu" = "0.0832" - } packages = ["jq"] tags = merge({ "Project Name" : var.project_name @@ -121,7 +116,6 @@ scenario "autopilot" { awskms_unseal_key_arn = step.create_vpc.kms_key_arn cluster_tag_key = local.vault_tag_key common_tags = local.tags - max_price = local.max_price[matrix.distro] vpc_id = step.create_vpc.vpc_id } } @@ -215,7 +209,6 @@ scenario "autopilot" { awskms_unseal_key_arn = step.create_vpc.kms_key_arn common_tags = local.tags cluster_name = step.create_vault_cluster_targets.cluster_name - max_price = local.max_price[matrix.distro] vpc_id = step.create_vpc.vpc_id } } diff --git a/enos/enos-scenario-replication.hcl b/enos/enos-scenario-replication.hcl index 26b131fd8c..0b69367727 100644 --- a/enos/enos-scenario-replication.hcl +++ b/enos/enos-scenario-replication.hcl @@ -55,11 +55,6 @@ scenario "replication" { rhel = provider.enos.rhel ubuntu = provider.enos.ubuntu } - max_price = { - // These prices are based on on-demand cost for t3.large in us-east - "rhel" = "0.1432" - "ubuntu" = "0.0832" - } packages = ["jq"] tags = merge({ "Project Name" : var.project_name @@ -132,7 +127,6 @@ scenario "replication" { awskms_unseal_key_arn = step.create_vpc.kms_key_arn cluster_tag_key = local.vault_tag_key common_tags = local.tags - max_price = local.max_price[matrix.distro] vpc_id = step.create_vpc.vpc_id } } @@ -148,11 +142,10 @@ scenario "replication" { } variables { - ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["22.04"] + ami_id = step.ec2_info.ami_ids["amd64"]["ubuntu"]["22.04"] awskms_unseal_key_arn = step.create_vpc.kms_key_arn cluster_tag_key = local.backend_tag_key common_tags = local.tags - max_price = local.max_price["ubuntu"] vpc_id = step.create_vpc.vpc_id } } @@ -174,7 +167,6 @@ scenario "replication" { cluster_name = step.create_primary_cluster_targets.cluster_name cluster_tag_key = local.vault_tag_key common_tags = local.tags - max_price = local.max_price[matrix.distro] vpc_id = step.create_vpc.vpc_id } } @@ -192,7 +184,6 @@ scenario "replication" { awskms_unseal_key_arn = step.create_vpc.kms_key_arn cluster_tag_key = local.vault_tag_key common_tags = local.tags - max_price = local.max_price[matrix.distro] vpc_id = step.create_vpc.vpc_id } } @@ -206,11 +197,10 @@ scenario "replication" { } variables { - ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["22.04"] + ami_id = step.ec2_info.ami_ids["amd64"]["ubuntu"]["22.04"] awskms_unseal_key_arn = step.create_vpc.kms_key_arn cluster_tag_key = local.backend_tag_key common_tags = local.tags - max_price = local.max_price["ubuntu"] vpc_id = step.create_vpc.vpc_id } } diff --git a/enos/enos-scenario-smoke.hcl b/enos/enos-scenario-smoke.hcl index a3f9b726fd..eab5819c69 100644 --- a/enos/enos-scenario-smoke.hcl +++ b/enos/enos-scenario-smoke.hcl @@ -51,11 +51,6 @@ scenario "smoke" { rhel = provider.enos.rhel ubuntu = provider.enos.ubuntu } - max_price = { - // These prices are based on on-demand cost for t3.large in us-east - "rhel" = "0.1432" - "ubuntu" = "0.0832" - } packages = ["jq"] tags = merge({ "Project Name" : var.project_name @@ -131,7 +126,6 @@ scenario "smoke" { awskms_unseal_key_arn = step.create_vpc.kms_key_arn cluster_tag_key = local.vault_tag_key common_tags = local.tags - max_price = local.max_price[matrix.distro] vpc_id = step.create_vpc.vpc_id } } @@ -145,11 +139,10 @@ scenario "smoke" { } variables { - ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["22.04"] + ami_id = step.ec2_info.ami_ids["amd64"]["ubuntu"]["22.04"] awskms_unseal_key_arn = step.create_vpc.kms_key_arn cluster_tag_key = local.backend_tag_key common_tags = local.tags - max_price = local.max_price["ubuntu"] vpc_id = step.create_vpc.vpc_id } } diff --git a/enos/enos-scenario-ui.hcl b/enos/enos-scenario-ui.hcl index 90e3e129b9..4da4ba2cbb 100644 --- a/enos/enos-scenario-ui.hcl +++ b/enos/enos-scenario-ui.hcl @@ -25,12 +25,7 @@ scenario "ui" { bundle_path = abspath(var.vault_bundle_path) distro = "ubuntu" consul_version = "1.14.2" - max_price = { - // These prices are based on on-demand cost for t3.large in us-east - "rhel" = "0.1432" - "ubuntu" = "0.0832" - } - seal = "awskms" + seal = "awskms" tags = merge({ "Project Name" : var.project_name "Project" : "Enos", @@ -98,7 +93,6 @@ scenario "ui" { awskms_unseal_key_arn = step.create_vpc.kms_key_arn cluster_tag_key = local.vault_tag_key common_tags = local.tags - max_price = local.max_price[local.distro] vpc_id = step.create_vpc.vpc_id } } @@ -112,11 +106,10 @@ scenario "ui" { } variables { - ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["22.04"] + ami_id = step.ec2_info.ami_ids["amd64"]["ubuntu"]["22.04"] awskms_unseal_key_arn = step.create_vpc.kms_key_arn cluster_tag_key = local.backend_tag_key common_tags = local.tags - max_price = local.max_price["ubuntu"] vpc_id = step.create_vpc.vpc_id } } diff --git a/enos/enos-scenario-upgrade.hcl b/enos/enos-scenario-upgrade.hcl index e94c9ffaa1..927d67857a 100644 --- a/enos/enos-scenario-upgrade.hcl +++ b/enos/enos-scenario-upgrade.hcl @@ -45,11 +45,6 @@ scenario "upgrade" { rhel = provider.enos.rhel ubuntu = provider.enos.ubuntu } - max_price = { - // These prices are based on on-demand cost for t3.large in us-east - "rhel" = "0.1432" - "ubuntu" = "0.0832" - } packages = ["jq"] tags = merge({ "Project Name" : var.project_name @@ -126,7 +121,6 @@ scenario "upgrade" { awskms_unseal_key_arn = step.create_vpc.kms_key_arn cluster_tag_key = local.vault_tag_key common_tags = local.tags - max_price = local.max_price[matrix.distro] vpc_id = step.create_vpc.vpc_id } } @@ -140,11 +134,10 @@ scenario "upgrade" { } variables { - ami_id = step.ec2_info.ami_ids["arm64"]["ubuntu"]["22.04"] + ami_id = step.ec2_info.ami_ids["amd64"]["ubuntu"]["22.04"] awskms_unseal_key_arn = step.create_vpc.kms_key_arn cluster_tag_key = local.backend_tag_key common_tags = local.tags - max_price = local.max_price["ubuntu"] vpc_id = step.create_vpc.vpc_id } }