Merge pull request #76 from stackhpc/volume-type

Alex-Welsh · web-flow · commit f81d10f7a1bf · 2024-10-10T11:12:13.000+01:00
Add volume type variable
diff --git a/compute_instances.tf b/compute_instances.tf
@@ -36,6 +36,7 @@ resource "openstack_compute_instance_v2" "ansible_control" {
       boot_index            = 0
       destination_type      = "volume"
       delete_on_termination = true
+      var.volume_type == "" ? null : var.volume_type
     }
   }
   timeouts {
@@ -67,6 +68,7 @@ resource "openstack_compute_instance_v2" "seed" {
       boot_index            = 0
       destination_type      = "volume"
       delete_on_termination = true
+      var.volume_type == "" ? null : var.volume_type
     }
   }
   timeouts {
@@ -94,6 +96,7 @@ resource "openstack_compute_instance_v2" "compute" {
       boot_index            = 0
       destination_type      = "volume"
       delete_on_termination = true
+      var.volume_type == "" ? null : var.volume_type
     }
   }
   timeouts {
@@ -120,6 +123,7 @@ resource "openstack_compute_instance_v2" "controller" {
       boot_index            = 0
       destination_type      = "volume"
       delete_on_termination = true
+      var.volume_type == "" ? null : var.volume_type
     }
   }
   timeouts {
@@ -147,6 +151,7 @@ resource "openstack_compute_instance_v2" "storage" {
       boot_index            = 0
       destination_type      = "volume"
       delete_on_termination = true
+      var.volume_type == "" ? null : var.volume_type
     }
   }
   timeouts {
@@ -172,6 +177,7 @@ resource "openstack_compute_instance_v2" "wazuh_manager" {
     boot_index            = 0
     destination_type      = "volume"
     delete_on_termination = true
+    var.volume_type == "" ? null : var.volume_type
   }
   timeouts {
     create = "90m"
diff --git a/leafcloud-rocky-9.tfvars.example b/leafcloud-rocky-9.tfvars.example
@@ -36,3 +36,5 @@ infra_vm_disk_size = 100
 
 add_ansible_control_fip = true
 ansible_control_fip_pool = "external"
+
+volume_type = ""
diff --git a/variables.tf b/variables.tf
@@ -129,3 +129,9 @@ variable "ansible_control_fip_pool" {
   type = string
   default = ""
 }
+
+variable "volume_type" {
+  description = "Volume type to use for block storage. Set to empty string to use the default volume type."
+  type = string
+  default = ""
+}
diff --git a/volumes.tf b/volumes.tf
@@ -2,6 +2,7 @@ resource "openstack_blockstorage_volume_v3" "volumes" {
   count = var.storage_count
   name  = format("%s-osd-%02d", var.prefix, count.index + 1)
   size  = 40
+  var.volume_type == "" ? null : var.volume_type
 }
 
 resource "openstack_compute_volume_attach_v2" "attachments" {

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ resource "openstack_compute_instance_v2" "ansible_control" {`
`36`	`36`	`boot_index = 0`
`37`	`37`	`destination_type = "volume"`
`38`	`38`	`delete_on_termination = true`
	`39`	`+ var.volume_type == "" ? null : var.volume_type`
`39`	`40`	`}`
`40`	`41`	`}`
`41`	`42`	`timeouts {`
`@@ -67,6 +68,7 @@ resource "openstack_compute_instance_v2" "seed" {`
`67`	`68`	`boot_index = 0`
`68`	`69`	`destination_type = "volume"`
`69`	`70`	`delete_on_termination = true`
	`71`	`+ var.volume_type == "" ? null : var.volume_type`
`70`	`72`	`}`
`71`	`73`	`}`
`72`	`74`	`timeouts {`
`@@ -94,6 +96,7 @@ resource "openstack_compute_instance_v2" "compute" {`
`94`	`96`	`boot_index = 0`
`95`	`97`	`destination_type = "volume"`
`96`	`98`	`delete_on_termination = true`
	`99`	`+ var.volume_type == "" ? null : var.volume_type`
`97`	`100`	`}`
`98`	`101`	`}`
`99`	`102`	`timeouts {`
`@@ -120,6 +123,7 @@ resource "openstack_compute_instance_v2" "controller" {`
`120`	`123`	`boot_index = 0`
`121`	`124`	`destination_type = "volume"`
`122`	`125`	`delete_on_termination = true`
	`126`	`+ var.volume_type == "" ? null : var.volume_type`
`123`	`127`	`}`
`124`	`128`	`}`
`125`	`129`	`timeouts {`
`@@ -147,6 +151,7 @@ resource "openstack_compute_instance_v2" "storage" {`
`147`	`151`	`boot_index = 0`
`148`	`152`	`destination_type = "volume"`
`149`	`153`	`delete_on_termination = true`
	`154`	`+ var.volume_type == "" ? null : var.volume_type`
`150`	`155`	`}`
`151`	`156`	`}`
`152`	`157`	`timeouts {`
`@@ -172,6 +177,7 @@ resource "openstack_compute_instance_v2" "wazuh_manager" {`
`172`	`177`	`boot_index = 0`
`173`	`178`	`destination_type = "volume"`
`174`	`179`	`delete_on_termination = true`
	`180`	`+ var.volume_type == "" ? null : var.volume_type`
`175`	`181`	`}`
`176`	`182`	`timeouts {`
`177`	`183`	`create = "90m"`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ resource "openstack_blockstorage_volume_v3" "volumes" {`
`2`	`2`	`count = var.storage_count`
`3`	`3`	`name = format("%s-osd-%02d", var.prefix, count.index + 1)`
`4`	`4`	`size = 40`
	`5`	`+ var.volume_type == "" ? null : var.volume_type`
`5`	`6`	`}`
`6`	`7`
`7`	`8`	`resource "openstack_compute_volume_attach_v2" "attachments" {`