"
region = "europe-west4"
zone = "europe-west4-a"
+labels = {
+ example="simple_daos_server_example"
+}
number_of_instances = 4 # Allow 3-way replication with extra spare for rebuild
daos_disk_count = 16
diff --git a/terraform/examples/simple_daos_server_example/variables.tf b/terraform/examples/simple_daos_server_example/variables.tf
index 86369e80f60..2d5f0cf6a3a 100644
--- a/terraform/examples/simple_daos_server_example/variables.tf
+++ b/terraform/examples/simple_daos_server_example/variables.tf
@@ -27,6 +27,12 @@ variable "zone" {
type = string
}
+variable "labels" {
+ description = "Set of key/value label pairs to assign to daos-server instances"
+ type = any
+ default = {}
+}
+
variable "os_family" {
description = "OS GCP image family"
default = null
diff --git a/terraform/modules/daos_client/README.md b/terraform/modules/daos_client/README.md
index 72cdc39381d..a9135cb4268 100644
--- a/terraform/modules/daos_client/README.md
+++ b/terraform/modules/daos_client/README.md
@@ -40,6 +40,7 @@ No modules.
|------|-------------|------|---------|:--------:|
| [daos\_service\_account\_scopes](#input\_daos\_service\_account\_scopes) | Scopes for the DAOS client service account | `list(string)` | [
"userinfo-email",
"compute-ro",
"storage-ro"
]
| no |
| [instance\_base\_name](#input\_instance\_base\_name) | MIG instance base names to use | `string` | `null` | no |
+| [labels](#input\_labels) | Set of key/value label pairs to assign to daos-client instances | `any` | n/a | no |
| [machine\_type](#input\_machine\_type) | GCP machine type. ie. e2-medium | `string` | `null` | no |
| [mig\_name](#input\_mig\_name) | MIG name | `string` | `null` | no |
| [network](#input\_network) | GCP network to use | `string` | `null` | no |
diff --git a/terraform/modules/daos_client/main.tf b/terraform/modules/daos_client/main.tf
index d3f3ff2c265..bbd90def52a 100644
--- a/terraform/modules/daos_client/main.tf
+++ b/terraform/modules/daos_client/main.tf
@@ -26,6 +26,7 @@ resource "google_compute_instance_template" "daos_sig_template" {
tags = ["daos-client"]
project = var.project_id
region = var.region
+ labels = var.labels
disk {
source_image = data.google_compute_image.os_image.self_link
diff --git a/terraform/modules/daos_client/variables.tf b/terraform/modules/daos_client/variables.tf
index 121f9d27d77..8a4445f66ed 100644
--- a/terraform/modules/daos_client/variables.tf
+++ b/terraform/modules/daos_client/variables.tf
@@ -29,6 +29,12 @@ variable "zone" {
default = null
}
+variable "labels" {
+ description = "Set of key/value label pairs to assign to daos-client instances"
+ type = any
+ default = {}
+}
+
variable "os_family" {
description = "OS GCP image family"
default = null
diff --git a/terraform/modules/daos_server/README.md b/terraform/modules/daos_server/README.md
index 13f0368f43c..db640022dc0 100644
--- a/terraform/modules/daos_server/README.md
+++ b/terraform/modules/daos_server/README.md
@@ -39,6 +39,7 @@ The resources/services/activations/deletions that this module will create/trigge
| [daos\_disk\_type](#input\_daos\_disk\_type) | Daos disk type to use. For now only suported one is local-ssd | `string` | `"local-ssd"` | no |
| [daos\_service\_account\_scopes](#input\_daos\_service\_account\_scopes) | Scopes for the DAOS server service account | `list(string)` | [
"userinfo-email",
"compute-ro",
"storage-ro"
]
| no |
| [instance\_base\_name](#input\_instance\_base\_name) | MIG instance base names to use | `string` | `"daos-server"` | no |
+| [labels](#input\_labels) | Set of key/value label pairs to assign to daos-server instances | `any` | n/a | no |
| [machine\_type](#input\_machine\_type) | GCP machine type. ie. e2-medium | `string` | `"n2-custom-20-131072"` | no |
| [mig\_name](#input\_mig\_name) | MIG name | `string` | `"daos-server"` | no |
| [network](#input\_network) | GCP network to use | `string` | n/a | yes |
diff --git a/terraform/modules/daos_server/main.tf b/terraform/modules/daos_server/main.tf
index 577b0069097..bdfc5f547d0 100644
--- a/terraform/modules/daos_server/main.tf
+++ b/terraform/modules/daos_server/main.tf
@@ -26,6 +26,7 @@ resource "google_compute_instance_template" "daos_sig_template" {
tags = ["daos-server"]
project = var.project_id
region = var.region
+ labels = var.labels
disk {
source_image = data.google_compute_image.os_image.self_link
diff --git a/terraform/modules/daos_server/variables.tf b/terraform/modules/daos_server/variables.tf
index 0b136bd52f7..c544f3c56ba 100644
--- a/terraform/modules/daos_server/variables.tf
+++ b/terraform/modules/daos_server/variables.tf
@@ -29,6 +29,12 @@ variable "zone" {
default = null
}
+variable "labels" {
+ description = "Set of key/value label pairs to assign to daos-server instances"
+ type = any
+ default = {}
+}
+
variable "os_family" {
description = "OS GCP image family"
default = null