xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-21 19:22:05 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7099 from gurevichmark/sles15.3_initial

Browse Source 
Update SLES15 compute template
This commit is contained in:
besawn 2022-01-28 14:28:29 -05:00 committed by GitHub
commit 0a452c30ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xCAT-server/lib/perl/xCAT/Template.pm
View File

@ -1576,6 +1576,11 @@ sub includefile
}
chomp($text);
if (($pkglist == 2) && (length($text)) < 1) {
# If processing a "pattern" (pkglist==2), and no patterns
# were listed in pkglist file, just return start and end tags
$text="$pkgb$pkge"
}
return ($text);
}

53
xCAT-server/share/xcat/install/sles/compute.sle15.tmpl
View File

@ -1,33 +1,16 @@
<?xml version="1.0"?>
<!DOCTYPE profile SYSTEM "/usr/share/YaST2/include/autoinstall/profile.dtd">
<!DOCTYPE profile>
<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
<install>
<bootloader>
<write_bootloader config:type="boolean">true</write_bootloader>
<activate config:type="boolean">true</activate>
<kernel_parameters></kernel_parameters>
<lba_support config:type="boolean">false</lba_support>
<linear config:type="boolean">false</linear>
<location>mbr</location>
<global>
<activate>true</activate>
</global>
</bootloader>
<general>
<clock>
<hwclock>UTC</hwclock>
<timezone>#TABLE:site:key=timezone:value#</timezone>
</clock>
<keyboard>
<keymap>english-us</keymap>
</keyboard>
<language>en_US</language>
<mode>
<confirm config:type="boolean">false</confirm>
<forceboot config:type="boolean">false</forceboot>
<interactive_boot config:type="boolean">false</interactive_boot>
<reboot config:type="boolean">true</reboot>
<final_reboot config:type="boolean">true</final_reboot>
</mode>
<mouse>
<id>non</id>
</mouse>
<signature-handling>
<accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key>
<accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key>
@ -35,6 +18,16 @@
<accept_verification_failed config:type="boolean">true</accept_verification_failed>
</signature-handling>
</general>
<timezone>
<hwclock>UTC</hwclock>
<timezone>#TABLE:site:key=timezone:value#</timezone>
</timezone>
<keyboard>
<keymap>english-us</keymap>
</keyboard>
<language>
<language>en_US</language>
</language>
<partitioning config:type="list">
<!-- XCAT-PARTITION-START -->
<drive>
@ -46,22 +39,20 @@
</partitioning>
<add-on>
<add_on_products config:type="list">
#INSTALL_SOURCES#
#INSTALL_SOURCES#
</add_on_products>
</add-on>
<software>
<products config:type="list">
<product>SLES</product>
<product>SLES</product>
</products>
<patterns config:type="list">
#INCLUDE_DEFAULT_PTRNLIST_S#
</patterns>
<packages config:type="list">
#INCLUDE_DEFAULT_PKGLIST_S#
#INCLUDE_DEFAULT_PKGLIST_S#
</packages>
</software>
</install>
<configure>
<users config:type="list">
<user>
<username>root</username>
@ -72,10 +63,8 @@
</user>
</users>
<networking>
<dns>
<dns>
<dhcp_hostname config:type="boolean">true</dhcp_hostname>
<dhcp_resolv config:type="boolean">true</dhcp_resolv>
<domain>local</domain>
<hostname>linux</hostname>
</dns>
<interfaces config:type="list">
@ -86,8 +75,7 @@
</interface>
</interfaces>
<routing>
<ip_forward config:type="boolean">false</ip_forward>
<routes config:type="list"/>
<ipv4_forward config:type="boolean">false</ipv4_forward>
</routing>
</networking>
<scripts>
@ -95,5 +83,4 @@
#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/chroot.sles#
#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.sle#
</scripts>
</configure>
</profile>