Skip to content

Fixes #38340 - auto-set preseed netplan ids #10508

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
ekohl merged 1 commit into from
Apr 7, 2025
Merged

Fixes #38340 - auto-set preseed netplan ids #10508

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
6 changes: 4 additions & 2 deletions app/views/unattended/provisioning_templates/snippet/preseed_netplan_generic_interface.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ oses:
- Ubuntu
-%>
<%- if @interface.identifier.blank? -%>
id0:
<%= @label %>:
<%- unless @interface.virtual? -%>
match:
macaddress: "<%= @host.mac %>"
macaddress: "<%= @interface.mac %>"
<%- end -%>
<%- else -%>
<%= @interface.identifier %>:
<%- end -%>
Expand Down
28 changes: 16 additions & 12 deletions app/views/unattended/provisioning_templates/snippet/preseed_netplan_setup.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ oses:
<%#
##### Processing bond-interfaces #####
-%>
<%- found = false -%>
<%- id = 0 -%>
<%- @host.bond_interfaces.each do | bond | -%>
<%- bonding_interfaces.push(bond.identifier) -%>
<%- if !found -%>
<%- found = true -%>
<%- if id == 0 -%>
bonds:
<%- end -%>
<%- result= snippet('preseed_netplan_generic_interface', :variables => {
:interface => bond,
:label => "bond#{id}",
:subnet => bond.subnet,
:subnet6 => bond.subnet6,
:dhcp => bond.subnet.nil? ? false : bond.subnet.dhcp_boot_mode?,
Expand All @@ -44,68 +44,72 @@ oses:
<%- options.each do | option | -%>
<%= option.gsub('=',': ') %>
<%- end -%>
<%- id += 1 -%>
<% end -%>
<%#
##### Processing bridge interfaces #####
-%>
<%- found = false -%>
<%- id = 0 -%>
<%- @host.bridge_interfaces.each do | bridge | -%>
<%- next if bonding_interfaces.include?(bridge.identifier) -%>
<%- bridged_interfaces.push(bridge.identifier) -%>
<%- if !found -%>
<%- found = true -%>
<%- if id == 0 -%>
bridges:
<%- end -%>
<%- result= snippet('preseed_netplan_generic_interface', :variables => {
:interface => bridge,
:label => "bridge#{id}",
:subnet => bridge.subnet,
:subnet6 => bridge.subnet6,
:dhcp => bridge.subnet.nil? ? false : bridge.subnet.dhcp_boot_mode?,
:dhcp6 => bridge.subnet6.nil? ? false : bridge.subnet6.dhcp_boot_mode? }) -%>
<%= result -%>
<%- id += 1 -%>
<%- end -%>
<%#
##### Processing vlan interfaces #####
-%>
<%- found = false -%>
<%- id = 0 -%>
<%- @host.managed_interfaces.each do | vlan | -%>
<%- next if bonding_interfaces.include?(vlan.identifier) -%>
<%- next if bridged_interfaces.include?(vlan.identifier) -%>
<%- next if !vlan.virtual? -%>
<%- vlans_interfaces.push(vlan.identifier) -%>
<%- if !found -%>
<%- found = true -%>
<%- if id == 0 -%>
vlans:
<%- end -%>
<%- result= snippet('preseed_netplan_generic_interface', :variables => {
:interface => vlan,
:label => "vlan#{id}",
:subnet => vlan.subnet,
:subnet6 => vlan.subnet6,
:dhcp => vlan.subnet.nil? ? false : vlan.subnet.dhcp_boot_mode?,
:dhcp6 => vlan.subnet6.nil? ? false : vlan.subnet6.dhcp_boot_mode? }) -%>
<%= result -%>
id: <%= vlan.tag %>
link: <%= vlan.attached_to %>
<%- id += 1 -%>
<%- end -%>
<%#
##### Processing remaining interfaces (ethernets) #####
-%>
<%- found = false -%>
<%- id = 0 -%>
<%- @host.managed_interfaces.each do | interface | -%>
<%- next if bonding_interfaces.include?(interface.identifier) -%>
<%- next if bridged_interfaces.include?(interface.identifier) -%>
<%- next if vlans_interfaces.include?(interface.identifier) -%>
<%- interface_subnet = interface.subnet -%>
<%- if !found -%>
<%- found = true -%>
<%- if id == 0 -%>
ethernets:
<%- end -%>
<%- result= snippet('preseed_netplan_generic_interface', :variables => {
:interface => interface,
:label => "id#{id}",
:subnet => interface.subnet,
:subnet6 => interface.subnet6,
:dhcp => interface.subnet.nil? ? false : interface.subnet.dhcp_boot_mode?,
:dhcp6 => interface.subnet6.nil? ? false : interface.subnet6.dhcp_boot_mode? }) -%>
<%= result -%>
<%- id += 1 -%>
<%- end -%>
<%- end -%>
Loading