Skip to content

Commit

Permalink
Correct ignitionHost for vSphere UPI
Browse files Browse the repository at this point in the history
Does not set vSphere specific ignitionHost if APIVIP is not provided.
  • Loading branch information
mtnbikenc committed Jan 21, 2020
1 parent ae27357 commit 1ce61da
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions pkg/asset/ignition/machine/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ import (
// served by the machine config server.
func pointerIgnitionConfig(installConfig *types.InstallConfig, rootCA []byte, role string) *ignition.Config {
var ignitionHost string
// Default platform independent ignitionHost
ignitionHost = fmt.Sprintf("api-int.%s:22623", installConfig.ClusterDomain())
// Update ignitionHost as necessary for platform
switch installConfig.Platform.Name() {
case baremetaltypes.Name:
// Baremetal needs to point directly at the VIP because we don't have a
Expand All @@ -28,17 +31,14 @@ func pointerIgnitionConfig(installConfig *types.InstallConfig, rootCA []byte, ro
apiVIP, err := openstackdefaults.APIVIP(installConfig.Networking)
if err == nil {
ignitionHost = fmt.Sprintf("%s:22623", apiVIP.String())
} else {
ignitionHost = fmt.Sprintf("api-int.%s:22623", installConfig.ClusterDomain())
}
case ovirttypes.Name:
ignitionHost = fmt.Sprintf("%s:22623", installConfig.Ovirt.APIVIP)
case vspheretypes.Name:
ignitionHost = fmt.Sprintf("%s:22623", installConfig.VSphere.APIVIP)
default:
ignitionHost = fmt.Sprintf("api-int.%s:22623", installConfig.ClusterDomain())
if installConfig.VSphere.APIVIP != "" {
ignitionHost = fmt.Sprintf("%s:22623", installConfig.VSphere.APIVIP)
}
}

return &ignition.Config{
Ignition: ignition.Ignition{
Version: ignition.MaxVersion.String(),
Expand Down

0 comments on commit 1ce61da

Please sign in to comment.