Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions environments/site/tofu/additional.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ module "additional" {
cluster_domain_suffix = var.cluster_domain_suffix
key_pair = var.key_pair
environment_root = var.environment_root
config_drive = var.config_drive

# can be set for group, defaults to top-level value:
image_id = lookup(each.value, "image_id", var.cluster_image_id)
Expand Down
2 changes: 2 additions & 0 deletions environments/site/tofu/compute.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ module "compute" {
cluster_domain_suffix = var.cluster_domain_suffix
key_pair = var.key_pair
environment_root = var.environment_root
config_drive = var.config_drive

# can be set for group, defaults to top-level value:
image_id = lookup(each.value, "image_id", var.cluster_image_id)
Expand Down Expand Up @@ -60,4 +61,5 @@ module "compute" {
"gateway_ip",
"nodename_template",
]

}
2 changes: 2 additions & 0 deletions environments/site/tofu/control.tf
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,6 @@ resource "openstack_compute_instance_v2" "control" {
%{endif}
EOF

config_drive = var.config_drive

}
2 changes: 2 additions & 0 deletions environments/site/tofu/login.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ module "login" {
cluster_domain_suffix = var.cluster_domain_suffix
key_pair = var.key_pair
environment_root = var.environment_root
config_drive = var.config_drive

# can be set for group, defaults to top-level value:
image_id = lookup(each.value, "image_id", var.cluster_image_id)
Expand Down Expand Up @@ -65,4 +66,5 @@ module "login" {
"nodename_template",
"security_group_ids"
]

}
4 changes: 4 additions & 0 deletions environments/site/tofu/node_group/nodes.tf
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ resource "openstack_compute_instance_v2" "compute_fixed_image" {

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

config_drive = var.config_drive

lifecycle {
ignore_changes = [
image_id,
Expand Down Expand Up @@ -175,6 +177,8 @@ resource "openstack_compute_instance_v2" "compute" {

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

config_drive = var.config_drive

}

resource "openstack_networking_floatingip_associate_v2" "fip" {
Expand Down
4 changes: 4 additions & 0 deletions environments/site/tofu/node_group/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,7 @@ variable "allowed_keys" {
type = list
# don't provide a default here as allowed keys may depend on module use
}

variable "config_drive" {
type = bool
}
9 changes: 9 additions & 0 deletions environments/site/tofu/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -313,3 +313,12 @@ variable "cluster_nodename_template" {
type = string
default = "$${cluster_name}-$${node}.$${cluster_name}.$${cluster_domain_suffix}"
}

variable "config_drive" {
description = <<-EOT
Whether to enable Nova config drives on all nodes, which will attach a drive containing
information usually provided through the metadata service.
EOT
type = bool
default = null
}
Loading