Skip to content

Allow specifying instance root volume type #693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 29, 2025
+16 −0
Merged

Allow specifying instance root volume type #693

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
318fb42
allow specifying root volume type
sjpb May 29, 2025
a0744af
Update environments/skeleton/{{cookiecutter.environment}}/tofu/variab…
sjpb May 29, 2025
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/skeleton/{{cookiecutter.environment}}/tofu/compute.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ module "compute" {
vnic_types = lookup(each.value, "vnic_types", var.vnic_types)
volume_backed_instances = lookup(each.value, "volume_backed_instances", var.volume_backed_instances)
root_volume_size = lookup(each.value, "root_volume_size", var.root_volume_size)
root_volume_type = lookup(each.value, "root_volume_type", var.root_volume_type)
gateway_ip = lookup(each.value, "gateway_ip", var.gateway_ip)
nodename_template = lookup(each.value, "nodename_template", var.cluster_nodename_template)

Expand Down
1 change: 1 addition & 0 deletions environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ resource "openstack_compute_instance_v2" "control" {
source_type = "image"
destination_type = var.volume_backed_instances ? "volume" : "local"
volume_size = var.volume_backed_instances ? var.root_volume_size : null
volume_type = var.volume_backed_instances ? var.root_volume_type : null
boot_index = 0
delete_on_termination = true
}
Expand Down
1 change: 1 addition & 0 deletions environments/skeleton/{{cookiecutter.environment}}/tofu/login.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ module "login" {
vnic_types = lookup(each.value, "vnic_types", var.vnic_types)
volume_backed_instances = lookup(each.value, "volume_backed_instances", var.volume_backed_instances)
root_volume_size = lookup(each.value, "root_volume_size", var.root_volume_size)
root_volume_type = lookup(each.value, "root_volume_type", var.root_volume_type)
gateway_ip = lookup(each.value, "gateway_ip", var.gateway_ip)
nodename_template = lookup(each.value, "nodename_template", var.cluster_nodename_template)

Expand Down
2 changes: 2 additions & 0 deletions environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/nodes.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ resource "openstack_compute_instance_v2" "compute_fixed_image" {
source_type = "image"
destination_type = "volume"
volume_size = var.root_volume_size
volume_type = var.root_volume_type
boot_index = 0
delete_on_termination = true
}
Expand Down Expand Up @@ -136,6 +137,7 @@ resource "openstack_compute_instance_v2" "compute" {
source_type = "image"
destination_type = "volume"
volume_size = var.root_volume_size
volume_type = var.root_volume_type
boot_index = 0
delete_on_termination = true
}
Expand Down
5 changes: 5 additions & 0 deletions environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ variable "root_volume_size" {
default = 40
}

variable "root_volume_type" {
type = string
default = null
}

variable "extra_volumes" {
description = <<-EOF
Mapping defining additional volumes to create and attach.
Expand Down
6 changes: 6 additions & 0 deletions environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,12 @@ variable "root_volume_size" {
default = 40
}

variable "root_volume_type" {
description = "Type of root volume, if using volume backed instances. Default gives default volume type"
type = string
default = null
}

variable "gateway_ip" {
description = "Address to add default route via"
type = string
Expand Down
Loading