From 35aaaa6f87291d470da9364610d83456df900adc Mon Sep 17 00:00:00 2001 From: Eric Vallee Date: Thu, 12 Dec 2024 15:19:05 -0500 Subject: [PATCH] feat: INFRA-764 Added missing README arguments. Updated cloudinit references to last release tag --- README.md | 8 ++++++++ main.tf | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index e6b9b59..b6662a9 100644 --- a/README.md +++ b/README.md @@ -120,4 +120,12 @@ The module supports libvirt networks and macvtap (bridge mode). - **prometheus_secrets**: List of prometheus secrets (to access exporters, alertmanagers and other sattelite processes) to pass to the server's filesystem. The prometheus user that the prometheus process runs as will be made owner and given exclusive access to these files. Each element in the list takes the following keys: - **path**: Filesystem path where to store the secret on the server - **content**: Value of the secret +- **vault_agent**: Parameters for the optional vault agent that will be used to manage the dynamic secrets in the vm. + - **enabled**: If set to true, a vault agent service will be setup and will run in the vm. + - **auth_method**: Auth method the vault agent will use to authenticate with vault. Currently, only approle is supported. + - **config**: Configuration parameters for the auth method. + - **role_id**: Id of the app role to us. + - **secret_id**: Authentication secret to use the app role. + - **vault_address**: Endpoint to use to talk to vault. + - **vault_ca_cert**: CA certificate to use to validate vault's certificate. - **install_dependencies**: Whether cloud-init should install external dependencies (should be set to false if you already provide an image with the external dependencies built-in). \ No newline at end of file diff --git a/main.tf b/main.tf index be0b4b8..4f32a82 100644 --- a/main.tf +++ b/main.tf @@ -24,7 +24,7 @@ locals { } module "network_configs" { - source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//network?ref=7c60f66d536fb2f8aa44987ba173a0d6cf414d12" + source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//network?ref=v0.26.0" network_interfaces = concat( [for idx, libvirt_network in var.libvirt_networks: { ip = libvirt_network.ip @@ -46,7 +46,7 @@ module "network_configs" { } module "prometheus_config_updater_configs" { - source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//configurations-auto-updater?ref=7c60f66d536fb2f8aa44987ba173a0d6cf414d12" + source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//configurations-auto-updater?ref=v0.26.0" install_dependencies = var.install_dependencies filesystem = { path = "/etc/prometheus/configs/" @@ -86,18 +86,18 @@ module "prometheus_config_updater_configs" { } module "prometheus_configs" { - source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//prometheus?ref=7c60f66d536fb2f8aa44987ba173a0d6cf414d12" + source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//prometheus?ref=v0.26.0" install_dependencies = var.install_dependencies prometheus = var.prometheus } module "prometheus_node_exporter_configs" { - source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//prometheus-node-exporter?ref=7c60f66d536fb2f8aa44987ba173a0d6cf414d12" + source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//prometheus-node-exporter?ref=v0.26.0" install_dependencies = var.install_dependencies } module "chrony_configs" { - source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//chrony?ref=7c60f66d536fb2f8aa44987ba173a0d6cf414d12" + source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//chrony?ref=v0.26.0" install_dependencies = var.install_dependencies chrony = { servers = var.chrony.servers @@ -107,7 +107,7 @@ module "chrony_configs" { } module "fluentbit_updater_etcd_configs" { - source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//configurations-auto-updater?ref=7c60f66d536fb2f8aa44987ba173a0d6cf414d12" + source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//configurations-auto-updater?ref=v0.26.0" install_dependencies = var.install_dependencies filesystem = { path = "/etc/fluent-bit-customization/dynamic-config" @@ -147,7 +147,7 @@ module "fluentbit_updater_etcd_configs" { } module "fluentbit_updater_git_configs" { - source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//gitsync?ref=7c60f66d536fb2f8aa44987ba173a0d6cf414d12" + source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//gitsync?ref=v0.26.0" install_dependencies = var.install_dependencies filesystem = { path = "/etc/fluent-bit-customization/dynamic-config" @@ -167,7 +167,7 @@ module "fluentbit_updater_git_configs" { } module "fluentbit_configs" { - source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//fluent-bit?ref=7c60f66d536fb2f8aa44987ba173a0d6cf414d12" + source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//fluent-bit?ref=v0.26.0" install_dependencies = var.install_dependencies fluentbit = { metrics = var.fluentbit.metrics @@ -194,7 +194,7 @@ module "fluentbit_configs" { } module "vault_agent_configs" { - source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//vault-agent?ref=7c60f66d536fb2f8aa44987ba173a0d6cf414d12" + source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//vault-agent?ref=v0.26.0" install_dependencies = var.install_dependencies vault_agent = { auth_method = var.vault_agent.auth_method @@ -205,7 +205,7 @@ module "vault_agent_configs" { } module "data_volume_configs" { - source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//data-volumes?ref=7c60f66d536fb2f8aa44987ba173a0d6cf414d12" + source = "git::https://github.com/Ferlab-Ste-Justine/terraform-cloudinit-templates.git//data-volumes?ref=v0.26.0" volumes = [{ label = "prometheus_data" device = "vdb"