Skip to content

Fix installation of UEFI nodes #20

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

Open
vuntz wants to merge 2 commits into
base: stable/sap/3.0
Choose a base branch
from
Open

Fix installation of UEFI nodes #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9573b78
Fix installation of UEFI nodes
dirkmueller Jun 21, 2016
37d52d8
provisioner: Use correct attributes for autoyast profile (bsc#1021596)
vuntz Jan 27, 2017
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 chef/cookbooks/provisioner/recipes/update_nodes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,9 @@ def find_node_boot_mac_addresses(node, admin_data_net)
crowbar_join: "#{os_url}/crowbar_join.sh",
default_fs: mnode[:crowbar_wall][:default_fs] || "ext4",
needs_openvswitch:
(mnode[:network] && mnode[:network][:needs_openvswitch]) || false
(mnode[:network] && mnode[:network][:needs_openvswitch]) || false,
use_uefi: !mnode[:uefi].nil?,
domain_name: node.fetch(:dns, {})[:domain] || node[:domain]
)
end

Expand Down
22 changes: 21 additions & 1 deletion chef/cookbooks/provisioner/templates/default/autoyast.xml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
<keep_install_network config:type="boolean">true</keep_install_network>
<dns>
<dhcp_hostname config:type="boolean">true</dhcp_hostname>
<domain><%= node[:domain] %></domain>
<domain><%= @domain_name %></domain>
<hostname><%= @node_hostname %></hostname>
<resolv_conf_policy>auto</resolv_conf_policy>
<write_hostname config:type="boolean">false</write_hostname>
Expand All @@ -118,6 +118,16 @@
<type config:type="symbol">CT_DISK</type>
<disklabel>gpt</disklabel>
<partitions config:type="list">
<% if @use_uefi %>
<partition>
<create config:type="boolean">true</create>
<format config:type="boolean">true</format>
<filesystem config:type="symbol">vfat</filesystem>
<partition_id config:type="integer">259</partition_id>
<mount>/boot/efi</mount>
<size>128M</size>
</partition>
<% end %>
<partition>
<create config:type="boolean">true</create>
<partition_id config:type="integer">263</partition_id>
Expand Down Expand Up @@ -146,6 +156,16 @@
<type config:type="symbol">CT_DISK</type>
<initialize config:type="boolean">true</initialize>
<partitions config:type="list">
<% if @use_uefi %>
<partition>
<create config:type="boolean">true</create>
<format config:type="boolean">true</format>
<filesystem config:type="symbol">vfat</filesystem>
<partition_id config:type="integer">259</partition_id>
<mount>/boot/efi</mount>
<size>128M</size>
</partition>
<% end %>
<partition>
<create config:type="boolean">true</create>
<partition_id config:type="integer">263</partition_id>
Expand Down