Merge pull request #8159 from mjturek/fix-sleep-415

[release-4.15] OCPBUGS-30854: Power VS: Fix wait_for_workspace
openshift · Mar 14, 2024 · 8b54909 · 8b54909
2 parents 24aabb7 + 95b6da4
commit 8b54909
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/data/data/powervs/cluster/iaas/iaas.tf b/data/data/powervs/cluster/iaas/iaas.tf
@@ -24,6 +24,7 @@ resource "ibm_resource_instance" "created_service_instance" {
     delete = "10m"
   }
 }
+
 resource "time_sleep" "wait_for_workspace" {
   count           = var.service_instance_name == "" ? 1 : 0
   depends_on      = [ibm_resource_instance.created_service_instance]

diff --git a/data/data/powervs/cluster/iaas/outputs.tf b/data/data/powervs/cluster/iaas/outputs.tf
@@ -1,11 +1,14 @@
 output "si_name" {
-  value = var.service_instance_name == "" ? one(resource.ibm_resource_instance.created_service_instance[*].name) : one(data.ibm_resource_instance.existing_service_instance[*].name)
+  depends_on = [resource.time_sleep.wait_for_workspace]
+  value      = var.service_instance_name == "" ? one(resource.ibm_resource_instance.created_service_instance[*].name) : one(data.ibm_resource_instance.existing_service_instance[*].name)
 }
 
 output "si_guid" {
-  value = var.service_instance_name == "" ? one(resource.ibm_resource_instance.created_service_instance[*].guid) : one(data.ibm_resource_instance.existing_service_instance[*].guid)
+  depends_on = [resource.time_sleep.wait_for_workspace]
+  value      = var.service_instance_name == "" ? one(resource.ibm_resource_instance.created_service_instance[*].guid) : one(data.ibm_resource_instance.existing_service_instance[*].guid)
 }
 
 output "si_crn" {
-  value = var.service_instance_name == "" ? one(resource.ibm_resource_instance.created_service_instance[*].crn) : one(data.ibm_resource_instance.existing_service_instance[*].crn)
+  depends_on = [resource.time_sleep.wait_for_workspace]
+  value      = var.service_instance_name == "" ? one(resource.ibm_resource_instance.created_service_instance[*].crn) : one(data.ibm_resource_instance.existing_service_instance[*].crn)
 }
diff --git a/data/data/powervs/variables-powervs.tf b/data/data/powervs/variables-powervs.tf
@@ -47,8 +47,8 @@ variable "powervs_service_instance_name" {
 
 variable "powervs_wait_for_workspace" {
   type        = string
-  description = "The seconds wait for the Power VS Workspace after creation, default is 60s"
-  default     = "60s"
+  description = "The seconds wait for the Power VS Workspace after creation, default is 3m"
+  default     = "3m"
 }
 
 ################################################################