Merge pull request #77 from stackhpc/volume-type

Alex-Welsh · web-flow · commit 98804a9a72ff · 2024-10-14T14:06:42.000+01:00
Fix volume_type variable
diff --git a/compute_instances.tf b/compute_instances.tf
@@ -36,7 +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
+      volume_type = var.volume_type == "" ? null : var.volume_type
     }
   }
   timeouts {
@@ -68,7 +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
+      volume_type = var.volume_type == "" ? null : var.volume_type
     }
   }
   timeouts {
@@ -96,7 +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
+      volume_type = var.volume_type == "" ? null : var.volume_type
     }
   }
   timeouts {
@@ -123,7 +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
+      volume_type = var.volume_type == "" ? null : var.volume_type
     }
   }
   timeouts {
@@ -151,7 +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
+      volume_type = var.volume_type == "" ? null : var.volume_type
     }
   }
   timeouts {
@@ -177,7 +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
+    volume_type = var.volume_type == "" ? null : var.volume_type
   }
   timeouts {
     create = "90m"
diff --git a/volumes.tf b/volumes.tf
@@ -2,7 +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
+  volume_type = 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,7 +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`	`+ volume_type = var.volume_type == "" ? null : var.volume_type`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`timeouts {`
`@@ -68,7 +68,7 @@ resource "openstack_compute_instance_v2" "seed" {`
`68`	`68`	`boot_index = 0`
`69`	`69`	`destination_type = "volume"`
`70`	`70`	`delete_on_termination = true`
`71`		`- var.volume_type == "" ? null : var.volume_type`
	`71`	`+ volume_type = var.volume_type == "" ? null : var.volume_type`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`timeouts {`
`@@ -96,7 +96,7 @@ resource "openstack_compute_instance_v2" "compute" {`
`96`	`96`	`boot_index = 0`
`97`	`97`	`destination_type = "volume"`
`98`	`98`	`delete_on_termination = true`
`99`		`- var.volume_type == "" ? null : var.volume_type`
	`99`	`+ volume_type = var.volume_type == "" ? null : var.volume_type`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`	`timeouts {`
`@@ -123,7 +123,7 @@ resource "openstack_compute_instance_v2" "controller" {`
`123`	`123`	`boot_index = 0`
`124`	`124`	`destination_type = "volume"`
`125`	`125`	`delete_on_termination = true`
`126`		`- var.volume_type == "" ? null : var.volume_type`
	`126`	`+ volume_type = var.volume_type == "" ? null : var.volume_type`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`	`timeouts {`
`@@ -151,7 +151,7 @@ resource "openstack_compute_instance_v2" "storage" {`
`151`	`151`	`boot_index = 0`
`152`	`152`	`destination_type = "volume"`
`153`	`153`	`delete_on_termination = true`
`154`		`- var.volume_type == "" ? null : var.volume_type`
	`154`	`+ volume_type = var.volume_type == "" ? null : var.volume_type`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`timeouts {`
`@@ -177,7 +177,7 @@ resource "openstack_compute_instance_v2" "wazuh_manager" {`
`177`	`177`	`boot_index = 0`
`178`	`178`	`destination_type = "volume"`
`179`	`179`	`delete_on_termination = true`
`180`		`- var.volume_type == "" ? null : var.volume_type`
	`180`	`+ volume_type = var.volume_type == "" ? null : var.volume_type`
`181`	`181`	`}`
`182`	`182`	`timeouts {`
`183`	`183`	`create = "90m"`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +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`	`+ volume_type = var.volume_type == "" ? null : var.volume_type`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`resource "openstack_compute_volume_attach_v2" "attachments" {`