kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

E2E: namespace HCP vault and consul policies to avoid collisions (#12386)

Browse Source 
Concurrent E2E runs can collide when provisioning policies on HCP
Consul and HCP Vault. Namespace these by the test run name, as we do
for most everything else.
This commit is contained in:
Tim Gross
2022-03-25 16:05:59 -04:00
committed by GitHub
parent 4d6ea8c593
commit 37d831712f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e2e/terraform/hcp_consul.tf
View File

@@ -11,7 +11,7 @@ data "hcp_consul_cluster" "e2e_shared_consul" {
# policy and configuration for the Consul Agent
resource "consul_acl_policy" "consul_agent" {
name = "consul_agent_policy"
name = "${local.random_name}_consul_agent_policy"
datacenters = [var.hcp_consul_cluster_id]
rules = data.local_file.consul_policy_for_consul_agent.content
}
@@ -65,7 +65,7 @@ resource "local_file" "consul_systemd_unit_file" {
# Nomad servers configuration for Consul
resource "consul_acl_policy" "nomad_servers" {
name = "nomad_server_policy"
name = "${local.random_name}_nomad_server_policy"
datacenters = [var.hcp_consul_cluster_id]
rules = data.local_file.consul_policy_for_nomad_server.content
}
@@ -97,7 +97,7 @@ resource "local_file" "nomad_server_config_for_consul" {
# Nomad clients configuration for Consul
resource "consul_acl_policy" "nomad_clients" {
name = "nomad_client_policy"
name = "${local.random_name}_nomad_client_policy"
datacenters = [var.hcp_consul_cluster_id]
rules = data.local_file.consul_policy_for_nomad_clients.content
}

2
e2e/terraform/hcp_vault.tf
View File

@@ -11,7 +11,7 @@ data "hcp_vault_cluster" "e2e_shared_vault" {
# Nomad servers configuration for Vault
resource "vault_policy" "nomad" {
name = "nomad-server"
name = "${local.random_name}-nomad-server"
policy = data.local_file.vault_policy_for_nomad.content
}