Skip to content

[release-4.12] OCPBUGS-4895: Set ip=dhcp,dhcp6 for master nodes on dualstack #6706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jan 21, 2023
Merged

[release-4.12] OCPBUGS-4895: Set ip=dhcp,dhcp6 for master nodes on dualstack #6706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion data/data/bootstrap/baremetal/files/usr/local/bin/startironic.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ IPTABLES=ip6tables
IPTABLES=iptables
{{ end }}

{{ if .UseIPv6ForNodeIP }}
{{ if .UseDualForNodeIP }}
EXTERNAL_IP_OPTIONS="ip=dhcp,dhcp6"
{{ else if .UseIPv6ForNodeIP }}
EXTERNAL_IP_OPTIONS="ip=dhcp6"
{{ else }}
EXTERNAL_IP_OPTIONS="ip=dhcp"
Expand Down
11 changes: 11 additions & 0 deletions pkg/asset/ignition/bootstrap/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ type bootstrapTemplateData struct {
PlatformData platformTemplateData
BootstrapInPlace *types.BootstrapInPlace
UseIPv6ForNodeIP bool
UseDualForNodeIP bool
IsFCOS bool
IsSCOS bool
IsOKD bool
Expand Down Expand Up @@ -281,6 +282,15 @@ func (a *Common) getTemplateData(dependencies asset.Parents, bootstrapInPlace bo
platformFirstAPIVIP := firstAPIVIP(&installConfig.Config.Platform)
APIIntVIPonIPv6 := utilsnet.IsIPv6String(platformFirstAPIVIP)

networkStack := 0
for _, snet := range installConfig.Config.ServiceNetwork {
if snet.IP.To4() != nil {
networkStack |= 1
} else {
networkStack |= 2
}
}

// Set cluster profile
clusterProfile := ""
if cp := os.Getenv("OPENSHIFT_INSTALL_EXPERIMENTAL_CLUSTER_PROFILE"); cp != "" {
Expand Down Expand Up @@ -308,6 +318,7 @@ func (a *Common) getTemplateData(dependencies asset.Parents, bootstrapInPlace bo
ClusterProfile: clusterProfile,
BootstrapInPlace: bootstrapInPlaceConfig,
UseIPv6ForNodeIP: APIIntVIPonIPv6,
UseDualForNodeIP: networkStack == 3,
IsFCOS: installConfig.Config.IsFCOS(),
IsSCOS: installConfig.Config.IsSCOS(),
IsOKD: installConfig.Config.IsOKD(),
Expand Down