Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 3 additions & 1 deletion cmd/openshift-install/waitfor.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ 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"
"github.com/openshift/installer/pkg/types/vsphere"
)

// getWaitOptionsFromInstallConfig constructs WaitOptions from an InstallConfig.
Expand All @@ -26,7 +28,7 @@ func getWaitOptionsFromInstallConfig(ic *types.InstallConfig) command.WaitOption
}
if ic != nil {
switch ic.Platform.Name() {
case baremetal.Name:
case baremetal.Name, openstack.Name, vsphere.Name:
options.ExtendTimeoutForBaremetal = true
case aws.Name:
if ic.AWS != nil &&
Expand Down