Skip to content

change template_file provider to templatefile function #410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

change template_file provider to templatefile function #410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions identity/vault-agent-demo/terraform-aws/vault-client.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,18 @@ resource "aws_instance" "vault-client" {
iam_instance_profile = aws_iam_instance_profile.vault-client.id

tags = {
Name = "${var.environment_name}-vault-client"
TTL = var.hashibot_reaper_ttl
Name = "${var.environment_name}-vault-client"
TTL = var.hashibot_reaper_ttl
}

user_data = data.template_file.vault-client.rendered
user_data = templatefile(
"${path.module}/templates/userdata-vault-client.tpl",
{
tpl_vault_zip_file = var.vault_zip_file
tpl_vault_service_name = "vault-${var.environment_name}"
tpl_vault_server_addr = aws_instance.vault-server[0].private_ip
}
)

lifecycle {
ignore_changes = [
Expand All @@ -24,14 +31,3 @@ resource "aws_instance" "vault-client" {
]
}
}

data "template_file" "vault-client" {
template = file("${path.module}/templates/userdata-vault-client.tpl")

vars = {
tpl_vault_zip_file = var.vault_zip_file
tpl_vault_service_name = "vault-${var.environment_name}"
tpl_vault_server_addr = aws_instance.vault-server[0].private_ip
}
}

31 changes: 14 additions & 17 deletions identity/vault-agent-demo/terraform-aws/vault-server.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,22 @@ resource "aws_instance" "vault-server" {
iam_instance_profile = aws_iam_instance_profile.vault-server.id

tags = {
Name = "${var.environment_name}-vault-server-${count.index}"
TTL = var.hashibot_reaper_ttl
Name = "${var.environment_name}-vault-server-${count.index}"
TTL = var.hashibot_reaper_ttl
}

user_data = data.template_file.vault-server.rendered
user_data = templatefile(
"${path.module}/templates/userdata-vault-server.tpl",
{
tpl_vault_zip_file = var.vault_zip_file
tpl_vault_service_name = "vault-${var.environment_name}"
tpl_kms_key = aws_kms_key.vault.id
tpl_aws_region = var.aws_region
account_id = data.aws_caller_identity.current.account_id
role_name = "${var.environment_name}-vault-client-role"
tpl_node_id = "${var.environment_name}-vault-server-role"
}
)

lifecycle {
ignore_changes = [
Expand All @@ -28,17 +39,3 @@ resource "aws_instance" "vault-server" {

data "aws_caller_identity" "current" {
}

data "template_file" "vault-server" {
template = file("${path.module}/templates/userdata-vault-server.tpl")

vars = {
tpl_vault_zip_file = var.vault_zip_file
tpl_vault_service_name = "vault-${var.environment_name}"
tpl_kms_key = aws_kms_key.vault.id
tpl_aws_region = var.aws_region
account_id = data.aws_caller_identity.current.account_id
role_name = "${var.environment_name}-vault-client-role"
tpl_node_id = "${var.environment_name}-vault-server-role"
}
}