From 7243b772bd7755a005fcef49fcbbef4cc191cdec Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 19 Jun 2026 16:31:00 +0100 Subject: [PATCH 1/2] openstack: Increase bootstrap timeout We frequently see build timeouts in CI. Many of these issues are due to slow infra, but if we are seeing these issues then it is likely customers see the same issues. Increase the timeout for OpenStack like we have already done for VMWare and baremetal. Signed-off-by: Stephen Finucane Assisted-by: Claude Opus 4.6 --- cmd/openshift-install/create.go | 5 +++-- cmd/openshift-install/waitfor.go | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmd/openshift-install/create.go b/cmd/openshift-install/create.go index f9af43bd7ea..e651f136ff7 100644 --- a/cmd/openshift-install/create.go +++ b/cmd/openshift-install/create.go @@ -42,6 +42,7 @@ import ( "github.com/openshift/installer/pkg/types/baremetal" "github.com/openshift/installer/pkg/types/dns" "github.com/openshift/installer/pkg/types/gcp" + "github.com/openshift/installer/pkg/types/openstack" "github.com/openshift/installer/pkg/types/vsphere" baremetalutils "github.com/openshift/installer/pkg/utils/baremetal" ) @@ -416,8 +417,8 @@ func waitForBootstrapComplete(ctx context.Context, config *rest.Config) *cluster timeout := 45 * time.Minute - // Wait longer for baremetal, VSphere due to length of time it takes to boot - if platformName == baremetal.Name || platformName == vsphere.Name { + // Wait longer for baremetal, vSphere, and OpenStack due to length of time it takes to boot + if platformName == baremetal.Name || platformName == openstack.Name || platformName == vsphere.Name { timeout = 60 * time.Minute } // For AWS, only increase timeout when UserProvisionedDNS is enabled diff --git a/cmd/openshift-install/waitfor.go b/cmd/openshift-install/waitfor.go index c5cb3a603fd..04e21c5b010 100644 --- a/cmd/openshift-install/waitfor.go +++ b/cmd/openshift-install/waitfor.go @@ -17,6 +17,7 @@ import ( "github.com/openshift/installer/pkg/types/aws" "github.com/openshift/installer/pkg/types/baremetal" "github.com/openshift/installer/pkg/types/dns" + "github.com/openshift/installer/pkg/types/openstack" ) // getWaitOptionsFromInstallConfig constructs WaitOptions from an InstallConfig. @@ -26,7 +27,7 @@ func getWaitOptionsFromInstallConfig(ic *types.InstallConfig) command.WaitOption } if ic != nil { switch ic.Platform.Name() { - case baremetal.Name: + case baremetal.Name, openstack.Name: options.ExtendTimeoutForBaremetal = true case aws.Name: if ic.AWS != nil && From ddf83ac4575ffb02ae5f11ba78fd1c7580863f2b Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 19 Jun 2026 16:40:48 +0100 Subject: [PATCH 2/2] vsphere: Extend cluster initialization timeout While working on extending the OpenStack timeout, it was noted the bootstrap timeout in create.go was extended to 60 minutes for vSphere (alongside baremetal) but the cluster initialization timeout in waitfor.go was not updated to match. This meant vSphere got 60 minutes for bootstrap but only the default 40 minutes for cluster initialization, which is inconsistent. Fix it. Signed-off-by: Stephen Finucane Assisted-By: Claude Opus 4.6 --- cmd/openshift-install/waitfor.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/openshift-install/waitfor.go b/cmd/openshift-install/waitfor.go index 04e21c5b010..4c6f473dbe9 100644 --- a/cmd/openshift-install/waitfor.go +++ b/cmd/openshift-install/waitfor.go @@ -18,6 +18,7 @@ import ( "github.com/openshift/installer/pkg/types/baremetal" "github.com/openshift/installer/pkg/types/dns" "github.com/openshift/installer/pkg/types/openstack" + "github.com/openshift/installer/pkg/types/vsphere" ) // getWaitOptionsFromInstallConfig constructs WaitOptions from an InstallConfig. @@ -27,7 +28,7 @@ func getWaitOptionsFromInstallConfig(ic *types.InstallConfig) command.WaitOption } if ic != nil { switch ic.Platform.Name() { - case baremetal.Name, openstack.Name: + case baremetal.Name, openstack.Name, vsphere.Name: options.ExtendTimeoutForBaremetal = true case aws.Name: if ic.AWS != nil &&