seasharp
/
anvil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Updated System->get_os_type() to add comments for RHEL8 and remove Fedora support.

Browse Source 
* Updated the pxe.txt template to use RHEL8 and remove Fedora support.
* Updated striker-manage-install-target to support RHEL8 and remove Fedora support.

Signed-off-by: Digimer <digimer@alteeve.ca>
main
Digimer 6 years ago
parent 06228918d6
commit 3e2a1faf06
8 changed files with 310 additions and 854 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      Anvil/Tools/System.pm
  2. 22
      html/skins/alteeve/pxe.txt
  3. 30
      notes
  4. 2
      pxe/kickstart/dr.ks
  5. 2
      pxe/kickstart/node.ks
  6. 2
      pxe/kickstart/striker.ks
  7. 22
      pxe/tftpboot/pxelinux.cfg/default
  8. 1070
      tools/striker-manage-install-target

14
Anvil/Tools/System.pm
Unescape View File

@ -999,7 +999,7 @@ This returns the operating system type and the system architecture as two separa
# Run on RHEL 7, on a 64-bit system # Run on RHEL 7, on a 64-bit system
my ($os_type, $os_arch) = $anvil->System->get_os_type(); my ($os_type, $os_arch) = $anvil->System->get_os_type();
# '$os_type' holds 'rhel7' ('rhel', 'centos' or 'fedora' + release version) # '$os_type' holds 'rhel8' ('rhel' or 'centos' + release version)
# '$os_arch' holds 'x86_64' (specifically, 'uname --hardware-platform') # '$os_arch' holds 'x86_64' (specifically, 'uname --hardware-platform')
If either can not be determined, C<< unknown >> will be returned. If either can not be determined, C<< unknown >> will be returned.
@ -1019,12 +1019,10 @@ sub get_os_type
my $os_arch = "unknown"; my $os_arch = "unknown";
### NOTE: Examples; ### NOTE: Examples;
# Red Hat Enterprise Linux Server release 6.10 (Santiago) # Red Hat Enterprise Linux release 8.0 Beta (Ootpa)
# Red Hat Enterprise Linux Server release 7.5 (Maipo) # Red Hat Enterprise Linux Server release 7.5 (Maipo)
# CentOS release 6.10 (Final)
# CentOS Linux release 7.5.1804 (Core) # CentOS Linux release 7.5.1804 (Core)
# Fedora release 28 (Twenty Eight)
#
# Read in the /etc/redhat-release file # Read in the /etc/redhat-release file
my $release = $anvil->Storage->read_file({file => $anvil->data->{path}{data}{'redhat-release'}}); my $release = $anvil->Storage->read_file({file => $anvil->data->{path}{data}{'redhat-release'}});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { release => $release }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { release => $release }});
@ -1040,12 +1038,6 @@ sub get_os_type
$os_type = "centos".$1; $os_type = "centos".$1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { os_type => $os_type }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { os_type => $os_type }});
} }
elsif ($release =~ /Fedora .*? (\d+) /)
{
# Fedora, with the version number appended
$os_type = "fedora".$1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { os_type => $os_type }});
}
my $output = $anvil->System->call({shell_call => $anvil->data->{path}{exe}{uname}." --hardware-platform"}); my $output = $anvil->System->call({shell_call => $anvil->data->{path}{exe}{uname}." --hardware-platform"});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { output => $output }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { output => $output }});

22
html/skins/alteeve/pxe.txt
Unescape View File

@ -678,41 +678,41 @@ menu label #!string!message_0084!#
TEXT HELP TEXT HELP
#!string!message_0085!# #!string!message_0085!#
ENDTEXT ENDTEXT
kernel fedora28/vmlinuz kernel rhel8/vmlinuz
# NOTE: add ' rd.debug' below for debugging # NOTE: add ' rd.debug' below for debugging
append initrd=fedora28/initrd.img root=live:#!variable!base_url!#/images/install.img inst.stage2=#!variable!base_url!#/os/ ip=dhcp inst.ks=#!variable!base_url!#/kickstart/striker.ks inst.gpt inst.sshd append initrd=rhel8/initrd.img root=live:#!variable!base_url!#/images/install.img inst.stage2=#!variable!base_url!#/os/ ip=dhcp inst.ks=#!variable!base_url!#/kickstart/striker.ks inst.gpt inst.sshd
label node label node
menu label #!string!message_0086!# menu label #!string!message_0086!#
TEXT HELP TEXT HELP
#!string!message_0087!# #!string!message_0087!#
ENDTEXT ENDTEXT
kernel fedora28/vmlinuz kernel rhel8/vmlinuz
append initrd=fedora28/initrd.img root=live:#!variable!base_url!#/images/install.img inst.stage2=#!variable!base_url!#/os/ ip=dhcp inst.ks=#!variable!base_url!#/kickstart/node.ks inst.gpt inst.sshd append initrd=rhel8/initrd.img root=live:#!variable!base_url!#/images/install.img inst.stage2=#!variable!base_url!#/os/ ip=dhcp inst.ks=#!variable!base_url!#/kickstart/node.ks inst.gpt inst.sshd
label node label node
menu label #!string!message_0088!# menu label #!string!message_0088!#
TEXT HELP TEXT HELP
#!string!message_0089!# #!string!message_0089!#
ENDTEXT ENDTEXT
kernel fedora28/vmlinuz kernel rhel8/vmlinuz
append initrd=fedora28/initrd.img root=live:#!variable!base_url!#/images/install.img inst.stage2=#!variable!base_url!#/os/ ip=dhcp inst.ks=#!variable!base_url!#/kickstart/dr.ks inst.gpt inst.sshd append initrd=rhel8/initrd.img root=live:#!variable!base_url!#/images/install.img inst.stage2=#!variable!base_url!#/os/ ip=dhcp inst.ks=#!variable!base_url!#/kickstart/dr.ks inst.gpt inst.sshd
label rescue label rescue
menu label #!string!message_0090!# menu label #!string!message_0090!#
TEXT HELP TEXT HELP
#!string!message_0091!# #!string!message_0091!#
ENDTEXT ENDTEXT
kernel fedora28/vmlinuz kernel rhel8/vmlinuz
append initrd=fedora28/initrd.img ip=dhcp root=live:#!variable!base_url!#/LiveOS/squashfs.img rescue inst.repo=#!variable!base_url!#/os/ ip=dhcp inst.sshd append initrd=rhel8/initrd.img ip=dhcp root=live:#!variable!base_url!#/LiveOS/squashfs.img rescue inst.repo=#!variable!base_url!#/os/ ip=dhcp inst.sshd
label fedora label rhel8
menu label #!string!message_0092!# menu label #!string!message_0092!#
TEXT HELP TEXT HELP
#!string!message_0093!# #!string!message_0093!#
ENDTEXT ENDTEXT
kernel fedora28/vmlinuz kernel rhel8/vmlinuz
append initrd=fedora28/initrd.img root=live:#!variable!base_url!#/images/install.img inst.repo=#!variable!base_url!#/os/ ip=dhcp inst.gpt inst.sshd append initrd=rhel8/initrd.img root=live:#!variable!base_url!#/images/install.img inst.repo=#!variable!base_url!#/os/ ip=dhcp inst.gpt inst.sshd
label next label next
menu default menu default

30
notes
Unescape View File

@ -664,7 +664,7 @@ clearpart --none --initlabel
# Use graphical install # Use graphical install
graphical graphical
# Use network installation # Use network installation
url --url="http://10.1.4.1/fedora28/x86_64/iso/" url --url="http://10.1.4.1/rhel8/x86_64/iso/"
# Keyboard layouts # Keyboard layouts
keyboard --vckeymap=us --xlayouts='us' keyboard --vckeymap=us --xlayouts='us'
# System language # System language
@ -1197,3 +1197,31 @@ diff -uNr htop-2.2.0 htop-2.2.0-digimer > whatever.patch
# Fabio's way # Fabio's way
diff -Naurd htop-2.2.0 htop-2.2.0-digimer > htop_python3_MakeHeader.patch diff -Naurd htop-2.2.0 htop-2.2.0-digimer > htop_python3_MakeHeader.patch
=======================================
chrissie's cluster script
# Run these commands on all nodes:
cp ../ifup-local /sbin
/sbin/ifup-local
pcs host auth -uhacluster -phacluster amy.chrissie.net anna.chrissie.net clara.chrissie.net fanny.chrissie.net
if [ "$(hostname)" != "amy.chrissie.net" -a "$(hostname)" != "amy" ]
then
exit
fi
# and these on just one:
pcs cluster setup taroxVMs amy.chrissie.net anna.chrissie.net clara.chrissie.net fanny.chrissie.net
pcs cluster start --all
sleep 30
pcs stonith create fence-virsh fence_virsh ipaddr=192.168.100.1 login=root passwd=christine pcmk_host_map="amy:rhel8-1;anna:rhel8-2;clara:rhel8-3;fanny:rhel8-4"
pcs property set stonith-enabled=true
pcs resource create dlm ocf:pacemaker:controld op monitor interval=60s on-fail=fence clone meta interleave=true clone-node-max=1 ordered=true
pcs resource create lvmlock ocf:heartbeat:lvmlockd op monitor interval=60s on-fail=fence clone meta interleave=true
pcs constraint order start dlm-clone then lvmlock-clone
pcs constraint colocation add lvmlock-clone with dlm-clone

2
pxe/kickstart/dr.ks
Unescape View File

@ -20,7 +20,7 @@ firstboot --disable
reboot reboot
# Install from the source Striker # Install from the source Striker
url --url=http://10.1.4.1/fedora28/x86_64/os/ url --url=http://10.201.4.1/rhel8/x86_64/os/
### TODO: These should be configurable eventually. ### TODO: These should be configurable eventually.
# Keyboard layouts # Keyboard layouts

2
pxe/kickstart/node.ks
Unescape View File

@ -20,7 +20,7 @@ firstboot --disable
reboot reboot
# Install from the source Striker # Install from the source Striker
url --url=http://10.1.4.1/fedora28/x86_64/os/ url --url=http://10.201.4.1/rhel8/x86_64/os/
### TODO: These should be configurable eventually. ### TODO: These should be configurable eventually.
# Keyboard layouts # Keyboard layouts

2
pxe/kickstart/striker.ks
Unescape View File

@ -20,7 +20,7 @@ firstboot --disable
reboot reboot
# Install from the source Striker # Install from the source Striker
url --url=http://10.1.4.1/fedora28/x86_64/os/ url --url=http://10.201.4.1/rhel8/x86_64/os/
### TODO: These should be configurable eventually. ### TODO: These should be configurable eventually.
# Keyboard layouts # Keyboard layouts

22
pxe/tftpboot/pxelinux.cfg/default
Unescape View File

@ -74,8 +74,8 @@ TEXT HELP
*** THERE WILL BE NO FURTHER PROMPT! PROCEED CAREFULLY! *** *** THERE WILL BE NO FURTHER PROMPT! PROCEED CAREFULLY! ***
ENDTEXT ENDTEXT
# \-----------------------------------------------------------------------------------------------------------/ # \-----------------------------------------------------------------------------------------------------------/
kernel fedora28/vmlinuz kernel rhel8/vmlinuz
append initrd=fedora28/initrd.img root=live:http://10.1.4.1/fedora28/x86_64/os/images/install.img inst.stage2=http://10.1.4.1/fedora28/x86_64/os/ ip=dhcp inst.ks=http://10.1.4.1/fedora28/x86_64/kickstart/striker.ks inst.sshd rd.debug append initrd=rhel8/initrd.img root=live:http://10.201.4.1/rhel8/x86_64/os/images/install.img inst.stage2=http://10.201.4.1/rhel8/x86_64/os/ ip=dhcp inst.ks=http://10.201.4.1/rhel8/x86_64/kickstart/striker.ks inst.sshd rd.debug
label node label node
menu label Install an Anvil! ^Node (Fedora 28 64-bit) menu label Install an Anvil! ^Node (Fedora 28 64-bit)
@ -92,8 +92,8 @@ TEXT HELP
*** THERE WILL BE NO FURTHER PROMPT! PROCEED CAREFULLY! *** *** THERE WILL BE NO FURTHER PROMPT! PROCEED CAREFULLY! ***
ENDTEXT ENDTEXT
# \-----------------------------------------------------------------------------------------------------------/ # \-----------------------------------------------------------------------------------------------------------/
kernel fedora28/vmlinuz kernel rhel8/vmlinuz
append initrd=fedora28/initrd.img root=live:http://10.1.4.1/fedora28/x86_64/os/images/install.img inst.stage2=http://10.1.4.1/fedora28/x86_64/os/ ip=dhcp inst.ks=http://10.1.4.1/fedora28/x86_64/kickstart/node.ks inst.sshd rd.debug append initrd=rhel8/initrd.img root=live:http://10.201.4.1/rhel8/x86_64/os/images/install.img inst.stage2=http://10.201.4.1/rhel8/x86_64/os/ ip=dhcp inst.ks=http://10.201.4.1/rhel8/x86_64/kickstart/node.ks inst.sshd rd.debug
label node label node
menu label Install an Anvil! ^Disaster Recover Host (Fedora 28 64-bit) menu label Install an Anvil! ^Disaster Recover Host (Fedora 28 64-bit)
@ -110,8 +110,8 @@ TEXT HELP
*** THERE WILL BE NO FURTHER PROMPT! PROCEED CAREFULLY! *** *** THERE WILL BE NO FURTHER PROMPT! PROCEED CAREFULLY! ***
ENDTEXT ENDTEXT
# \-----------------------------------------------------------------------------------------------------------/ # \-----------------------------------------------------------------------------------------------------------/
kernel fedora28/vmlinuz kernel rhel8/vmlinuz
append initrd=fedora28/initrd.img root=live:http://10.1.4.1/fedora28/x86_64/os/images/install.img inst.stage2=http://10.1.4.1/fedora28/x86_64/os/ ip=dhcp inst.ks=http://10.1.4.1/fedora28/x86_64/kickstart/dr.ks inst.sshd rd.debug append initrd=rhel8/initrd.img root=live:http://10.201.4.1/rhel8/x86_64/os/images/install.img inst.stage2=http://10.201.4.1/rhel8/x86_64/os/ ip=dhcp inst.ks=http://10.201.4.1/rhel8/x86_64/kickstart/dr.ks inst.sshd rd.debug
label rescue label rescue
menu label Boot into a ^Rescue session menu label Boot into a ^Rescue session
@ -125,10 +125,10 @@ TEXT HELP
No data on the target machine will be changed by this option. No data on the target machine will be changed by this option.
ENDTEXT ENDTEXT
# \-----------------------------------------------------------------------------------------------------------/ # \-----------------------------------------------------------------------------------------------------------/
kernel fedora28/vmlinuz kernel rhel8/vmlinuz
append initrd=fedora28initrd.img ip=dhcp root=live:http://10.1.4.1/fedora28/x86_64/os/LiveOS/squashfs.img rescue append initrd=rhel8initrd.img ip=dhcp root=live:http://10.201.4.1/rhel8/x86_64/os/LiveOS/squashfs.img rescue
label fedora label rhel8
menu label Install ^Standard Fedora 28 64-bit Install menu label Install ^Standard Fedora 28 64-bit Install
# Keep help text wrapped within the area shown directly below. # Keep help text wrapped within the area shown directly below.
# /-----------------------------------------------------------------------------------------------------------\ # /-----------------------------------------------------------------------------------------------------------\
@ -139,8 +139,8 @@ TEXT HELP
This option will not change anything on disk until and unless you choose to do so. This option will not change anything on disk until and unless you choose to do so.
ENDTEXT ENDTEXT
# \-----------------------------------------------------------------------------------------------------------/ # \-----------------------------------------------------------------------------------------------------------/
kernel fedora28/vmlinuz kernel rhel8/vmlinuz
append initrd=fedora28/initrd.img root=live:http://10.1.4.1/fedora28/x86_64/os/images/install.img append initrd=rhel8/initrd.img root=live:http://10.201.4.1/rhel8/x86_64/os/images/install.img
label next label next
menu default menu default

1070
tools/striker-manage-install-target
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save