Skip to content
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.

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

Feature #31363 - allow for dual stack IPv4 and v6 network settings during PXE boot #8144

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -32,7 +32,6 @@ snippet: true
options.push("kssendmac", "ks.sendmac", "inst.ks.sendmac")

# networking credentials
raise("Dual-stack provisioning not supported") if subnet4 && subnet6
if subnet4 && subnet4.dhcp_boot_mode?
options.push("ip=dhcp") if rhel_compatible && major >= 7
elsif subnet4 && !subnet4.dhcp_boot_mode?
Expand All @@ -50,7 +49,7 @@ snippet: true
options.push("ip=#{iface.ip}::#{subnet4.gateway}:#{subnet4.mask}:#{hostname}:#{iface.identifier}:none")
end
end
elsif subnet6.dhcp_boot_mode? && rhel_compatible && major >= 7
elsif subnet6 && subnet6.dhcp_boot_mode? && rhel_compatible && major >= 7
if host_param_true?("use-slaac")
options.push("ip=auto6")
else
Expand Down Expand Up @@ -102,7 +101,7 @@ snippet: true
end

nic_delay = subnet4 ? subnet4.nic_delay : nil
nic_delay ||= subnet6 ? subnet6.nic_delay : nil
nic_delay ||= !subnet4 && subnet6 ? subnet6.nic_delay : nil
if nic_delay && rhel_compatible && major >= 7
["dhcp", "iflink", "ifup", "route", "ipv6dad", "ipv6auto", "carrier"].each do |type|
options.push("rd.net.timeout.#{type}=#{nic_delay}")
Expand Down