scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-03 20:17:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

enos: use amd64 for consul backend (#17917)

Browse Source 
Previously we'd pass the matrix variant to the backend cluster module which is currently unsupported by the consul module. Instead we'll always pass the ubuntu/amd64 AMI ID to the consul backend module.

This should resolve the enos-verify-stable matrix failures here https://github.com/hashicorp/vault/actions/runs/3448137968/jobs/5754873688#step:11:191

Signed-off-by: Ryan Cragun <me@ryan.ec>
This commit is contained in:
Ryan Cragun
2022-11-15 11:44:05 -07:00
committed by GitHub
parent 260d1a0bea
commit e445c8b4f5
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
enos/enos-scenario-agent.hcl
View File

@@ -81,7 +81,7 @@ scenario "agent" {
module = module.create_vpc
variables {
ami_architectures = [matrix.arch]
ami_architectures = distinct([matrix.arch, "amd64"])
availability_zones = step.find_azs.availability_zones
common_tags = local.tags
}
@@ -105,7 +105,7 @@ scenario "agent" {
}
variables {
ami_id = step.create_vpc.ami_ids["ubuntu"][matrix.arch]
ami_id = step.create_vpc.ami_ids["ubuntu"]["amd64"]
common_tags = local.tags
instance_type = var.backend_instance_type
kms_key_arn = step.create_vpc.kms_key_arn

4
enos/enos-scenario-smoke.hcl
View File

@@ -84,7 +84,7 @@ scenario "smoke" {
module = module.create_vpc
variables {
ami_architectures = [matrix.arch]
ami_architectures = distinct([matrix.arch, "amd64"])
availability_zones = step.find_azs.availability_zones
common_tags = local.tags
}
@@ -108,7 +108,7 @@ scenario "smoke" {
}
variables {
ami_id = step.create_vpc.ami_ids["ubuntu"][matrix.arch]
ami_id = step.create_vpc.ami_ids["ubuntu"]["amd64"]
common_tags = local.tags
consul_release = {
edition = var.backend_edition

4
enos/enos-scenario-upgrade.hcl
View File

@@ -79,7 +79,7 @@ scenario "upgrade" {
module = module.create_vpc
variables {
ami_architectures = [matrix.arch]
ami_architectures = distinct([matrix.arch, "amd64"])
availability_zones = step.find_azs.availability_zones
common_tags = local.tags
}
@@ -108,7 +108,7 @@ scenario "upgrade" {
}
variables {
ami_id = step.create_vpc.ami_ids["ubuntu"][matrix.arch]
ami_id = step.create_vpc.ami_ids["ubuntu"]["amd64"]
common_tags = local.tags
consul_release = {
edition = var.backend_edition