Allow overriding bastion storage pool

Fixes #520 Signed-off-by: Yussuf Shaikh <yussuf.shaikh1@ibm.com>
ocp-power-automation · Feb 21, 2024 · 6af5a97 · 6af5a97
1 parent 82c0202
commit 6af5a97
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/modules/1_prepare/prepare.tf b/modules/1_prepare/prepare.tf
@@ -47,11 +47,17 @@ locals {
       length(local.project_bastion_image) == 0 ? ibm_pi_image.bastion[0].image_id : local.project_bastion_image[0].id
     )
   )
-  # If invalid then use hardcoded value; else if project image pool is not empty use catalog image pool; else if project image pool is empty use catalog image pool; else use project image pool
+  # If bastion.storage_pool is provided use it directly (Required because of bug in catalog image containing invalid pool)
+  # If invalid then use hardcoded value
+  # If catalog image is used then use catalog image pool
+  # If project image pool is not empty use project image pool;
+  # If project image pool is empty use catalog image pool;
   bastion_storage_pool = (
-    local.invalid_bastion_image ? "Tier3-Flash-1" : (
-      length(local.project_bastion_image) == 0 ? local.catalog_bastion_image[0].storage_pool : (
-        local.project_bastion_image[0].storage_pool == "" ? local.catalog_bastion_image[0].storage_pool : local.project_bastion_image[0].storage_pool
+    lookup(var.bastion, "storage_pool", "") != "" ? var.bastion["storage_pool"] : (
+      local.invalid_bastion_image ? "Tier3-Flash-1" : (
+        length(local.project_bastion_image) == 0 ? local.catalog_bastion_image[0].storage_pool : (
+          local.project_bastion_image[0].storage_pool == "" ? local.catalog_bastion_image[0].storage_pool : local.project_bastion_image[0].storage_pool
+        )
       )
     )
   )