Skip to content

Commit d2e07ff

Browse files
committed
config drive defaults to null + added to additional nodegroups
1 parent 4d33c7d commit d2e07ff

File tree

5 files changed

+4
-10
lines changed

5 files changed

+4
-10
lines changed

environments/site/tofu/additional.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ module "additional" {
1212
cluster_domain_suffix = var.cluster_domain_suffix
1313
key_pair = var.key_pair
1414
environment_root = var.environment_root
15+
config_drive = var.config_drive
1516

1617
# can be set for group, defaults to top-level value:
1718
image_id = lookup(each.value, "image_id", var.cluster_image_id)

environments/site/tofu/compute.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ module "compute" {
1212
cluster_domain_suffix = var.cluster_domain_suffix
1313
key_pair = var.key_pair
1414
environment_root = var.environment_root
15+
config_drive = var.config_drive
1516

1617
# can be set for group, defaults to top-level value:
1718
image_id = lookup(each.value, "image_id", var.cluster_image_id)
@@ -60,7 +61,5 @@ module "compute" {
6061
"gateway_ip",
6162
"nodename_template",
6263
]
63-
64-
config_drive = var.config_drive
6564

6665
}

environments/site/tofu/login.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ module "login" {
1212
cluster_domain_suffix = var.cluster_domain_suffix
1313
key_pair = var.key_pair
1414
environment_root = var.environment_root
15+
config_drive = var.config_drive
1516

1617
# can be set for group, defaults to top-level value:
1718
image_id = lookup(each.value, "image_id", var.cluster_image_id)
@@ -64,7 +65,5 @@ module "login" {
6465
"gateway_ip",
6566
"nodename_template",
6667
]
67-
68-
config_drive = var.config_drive
6968

7069
}

environments/site/tofu/node_group/variables.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,5 @@ variable "allowed_keys" {
194194
}
195195

196196
variable "config_drive" {
197-
description = <<-EOT
198-
Whether to enable Nova config drives on all nodes, which will mount a drive containing
199-
information that would usually be available through the metadata service.
200-
EOT
201197
type = bool
202-
default = false
203198
}

environments/site/tofu/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,5 +320,5 @@ variable "config_drive" {
320320
information usually provided through the metadata service.
321321
EOT
322322
type = bool
323-
default = false
323+
default = null
324324
}

0 commit comments

Comments
 (0)