Skip to content

Commit a3de2b7

Browse files
wtripp180901sjpb
andauthored
Allow setting config_drive (#756)
* allow setting volume type for extra_volumes * Added config drive option to tofu * docs suggestions Co-authored-by: Steve Brasier <[email protected]> * config drive defaults to null + added to additional nodegroups --------- Co-authored-by: Steve Brasier <[email protected]> Co-authored-by: Steve Brasier <[email protected]>
1 parent 952e5a9 commit a3de2b7

File tree

7 files changed

+24
-0
lines changed

7 files changed

+24
-0
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: 2 additions & 0 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,4 +61,5 @@ module "compute" {
6061
"gateway_ip",
6162
"nodename_template",
6263
]
64+
6365
}

environments/site/tofu/control.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,6 @@ resource "openstack_compute_instance_v2" "control" {
9494
%{endif}
9595
EOF
9696

97+
config_drive = var.config_drive
98+
9799
}

environments/site/tofu/login.tf

Lines changed: 2 additions & 0 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)
@@ -65,4 +66,5 @@ module "login" {
6566
"nodename_template",
6667
"security_group_ids"
6768
]
69+
6870
}

environments/site/tofu/node_group/nodes.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ resource "openstack_compute_instance_v2" "compute_fixed_image" {
120120

121121
availability_zone = var.match_ironic_node ? "${local.baremetal_az}::${var.baremetal_nodes[each.key]}" : var.availability_zone
122122

123+
config_drive = var.config_drive
124+
123125
lifecycle {
124126
ignore_changes = [
125127
image_id,
@@ -175,6 +177,8 @@ resource "openstack_compute_instance_v2" "compute" {
175177

176178
availability_zone = var.match_ironic_node ? "${local.baremetal_az}::${var.baremetal_nodes[each.key]}" : var.availability_zone
177179

180+
config_drive = var.config_drive
181+
178182
}
179183

180184
resource "openstack_networking_floatingip_associate_v2" "fip" {

environments/site/tofu/node_group/variables.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,3 +192,7 @@ variable "allowed_keys" {
192192
type = list
193193
# don't provide a default here as allowed keys may depend on module use
194194
}
195+
196+
variable "config_drive" {
197+
type = bool
198+
}

environments/site/tofu/variables.tf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,3 +313,12 @@ variable "cluster_nodename_template" {
313313
type = string
314314
default = "$${cluster_name}-$${node}.$${cluster_name}.$${cluster_domain_suffix}"
315315
}
316+
317+
variable "config_drive" {
318+
description = <<-EOT
319+
Whether to enable Nova config drives on all nodes, which will attach a drive containing
320+
information usually provided through the metadata service.
321+
EOT
322+
type = bool
323+
default = null
324+
}

0 commit comments

Comments
 (0)