Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cmd/openshift-install/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion cmd/openshift-install/waitfor.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Comment on lines 30 to 31

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Read-only verification: inspect all uses of ExtendTimeoutForBaremetal.
rg -n -C3 '\bExtendTimeoutForBaremetal\b'

Repository: openshift/installer

Length of output: 2053


Update field name and documentation; timeout-only usage is correct.

The field is correctly used as a generic boolean timeout extension across waitForInitializedCluster() (line 119 in cmd/openshift-install/command/waitfor.go). However, the field name ExtendTimeoutForBaremetal and its documentation comment ("extends the initialization timeout for baremetal platforms") are now inaccurate—the field is set to true for baremetal, openstack, and vsphere (line 31). Rename the field and update its documentation to reflect that it controls timeout extension for multiple platforms that require extended initialization time.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@cmd/openshift-install/waitfor.go` around lines 30 - 31, The field
`ExtendTimeoutForBaremetal` is set to true for multiple platforms (baremetal,
openstack, and vsphere), not just baremetal, making its name and documentation
inaccurate. Rename the field to a more generic name that reflects it controls
timeout extension for multiple platforms requiring extended initialization time,
and update its documentation comment to accurately describe its purpose across
all platforms that use it. Ensure all references to the field are updated,
including in the `waitForInitializedCluster()` function where it is consumed.

case aws.Name:
if ic.AWS != nil &&
Expand Down