From d29d2bf683e606582193124e59c78f8c2feca875 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 28 Jan 2021 13:47:28 -0500 Subject: [PATCH 1/4] Implement workaround for install over infiniband 8.3 implemented networkmanager to manage the install time networking, but didn't correctly generate infiniband network manager configuration. Workaround by checking for infiniband install, and then checking if the configuration is wrong, and adding an infiniband section if missing. --- .../usr/lib/dracut/hooks/initqueue/01-confluent.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh index aa81e4f8..323bb52c 100644 --- a/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh +++ b/confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh @@ -109,5 +109,13 @@ done < /etc/confluent/confluent.deploycfg if [ -e /lib/nm-lib.sh ]; then . /lib/nm-lib.sh nm_generate_connections + if [[ "$ifname" == ib* ]]; then + sed -i s/type=ethernet/type=infiniband/ /run/NetworkManager/system-connections/$ifname.nmconnection + if ! grep '\[infiniband\]' /run/NetworkManager/system-connections/$ifname.nmconnection > /dev/null; then + echo >> /run/NetworkManager/system-connections/$ifname.nmconnection + echo '[infiniband]' >> /run/NetworkManager/system-connections/$ifname.nmconnection + echo transport-mode=datagram >> /run/NetworkManager/system-connections/$ifname.nmconnection + fi + fi fi From a9e39eab96c98c634b84eb5a478037e783353938 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 28 Jan 2021 16:45:39 -0500 Subject: [PATCH 2/4] Fix path mistake in mofed.post script mofed.post had incorrect path to mofed.tgz after fetch. Correct the path mistake. --- .../el7/profiles/default/scripts/infiniband/mofed.post | 2 +- .../el8/profiles/default/scripts/infiniband/mofed.post | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/confluent_osdeploy/el7/profiles/default/scripts/infiniband/mofed.post b/confluent_osdeploy/el7/profiles/default/scripts/infiniband/mofed.post index a777ea5c..6d371bc3 100644 --- a/confluent_osdeploy/el7/profiles/default/scripts/infiniband/mofed.post +++ b/confluent_osdeploy/el7/profiles/default/scripts/infiniband/mofed.post @@ -11,7 +11,7 @@ if lspci -d 15b3:: -n |grep 15b3 > /dev/null; then #mkdir MLNX_OFED #mount -o loop ofed.iso MLNX_OFED fetch_remote infiniband/mofed.tgz - tar xf mofed.tgz + tar xf infiniband/mofed.tgz # The rest is common between tar and iso cd MLNX_OFED* mount -o loop ofed diff --git a/confluent_osdeploy/el8/profiles/default/scripts/infiniband/mofed.post b/confluent_osdeploy/el8/profiles/default/scripts/infiniband/mofed.post index a777ea5c..6d371bc3 100644 --- a/confluent_osdeploy/el8/profiles/default/scripts/infiniband/mofed.post +++ b/confluent_osdeploy/el8/profiles/default/scripts/infiniband/mofed.post @@ -11,7 +11,7 @@ if lspci -d 15b3:: -n |grep 15b3 > /dev/null; then #mkdir MLNX_OFED #mount -o loop ofed.iso MLNX_OFED fetch_remote infiniband/mofed.tgz - tar xf mofed.tgz + tar xf infiniband/mofed.tgz # The rest is common between tar and iso cd MLNX_OFED* mount -o loop ofed From a2f5b11185fa7f9b7225115b5e31595031a61bee Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 1 Feb 2021 08:42:35 -0500 Subject: [PATCH 3/4] Add Usb to nodesetboot Particularly for redfish, this is a more specific target --- confluent_client/bin/nodesetboot | 2 +- confluent_client/confluent_env.sh | 2 +- confluent_client/doc/man/nodesetboot.ronn | 6 +++++- confluent_server/confluent/messages.py | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/confluent_client/bin/nodesetboot b/confluent_client/bin/nodesetboot index 690907a4..c20ca368 100755 --- a/confluent_client/bin/nodesetboot +++ b/confluent_client/bin/nodesetboot @@ -32,7 +32,7 @@ if path.startswith('/opt'): import confluent.client as client argparser = optparse.OptionParser( - usage='Usage: %prog [options] noderange [default|cd|network|setup|hd|floppy]') + usage='Usage: %prog [options] noderange [default|cd|network|setup|hd|usb|floppy]') argparser.add_option('-b', '--bios', dest='biosmode', action='store_true', default=False, help='Request BIOS style boot (rather than UEFI)') diff --git a/confluent_client/confluent_env.sh b/confluent_client/confluent_env.sh index 5989f3db..97073971 100644 --- a/confluent_client/confluent_env.sh +++ b/confluent_client/confluent_env.sh @@ -91,7 +91,7 @@ _confluent_nodeidentify_completion() _confluent_nodesetboot_completion() { - COMP_CANDIDATES=("default,cd,network,setup,hd,floppy -h -b -p") + COMP_CANDIDATES=("default,cd,network,setup,hd,floppy,usb -h -b -p") _confluent_generic_completion } diff --git a/confluent_client/doc/man/nodesetboot.ronn b/confluent_client/doc/man/nodesetboot.ronn index 4219363c..b2b49e3c 100644 --- a/confluent_client/doc/man/nodesetboot.ronn +++ b/confluent_client/doc/man/nodesetboot.ronn @@ -4,7 +4,7 @@ nodesetboot(8) -- Check or set next boot device for noderange ## SYNOPSIS `nodesetboot ` -`nodesetboot [options] [default|cd|network|setup|hd|floppy]` +`nodesetboot [options] [default|cd|network|setup|hd|usb|floppy]` ## DESCRIPTION @@ -46,6 +46,10 @@ control. Request boot from floppy. Generally speaking firmware uses this to mean a USB flash drive or similar (whether virtual or physical). +* `usb`: + Request boot from usb. Generally speaking firmware uses this to mean a USB + flash drive or similar (whether virtual or physical). + * `network`: Request boot to network diff --git a/confluent_server/confluent/messages.py b/confluent_server/confluent/messages.py index 1d31dc12..2f6ab998 100644 --- a/confluent_server/confluent/messages.py +++ b/confluent_server/confluent/messages.py @@ -1147,6 +1147,7 @@ class BootDevice(ConfluentChoiceMessage): 'default', 'cd', 'floppy', + 'usb', ]) valid_bootmodes = set([ From 8cf264602d98ed4c9e033b5ad8ec4e2a1c558885 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 5 Feb 2021 14:02:28 -0500 Subject: [PATCH 4/4] Update status at end of esxi install --- confluent_osdeploy/esxi7/profiles/hypervisor/kickstart | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/confluent_osdeploy/esxi7/profiles/hypervisor/kickstart b/confluent_osdeploy/esxi7/profiles/hypervisor/kickstart index 69b2dcfd..eeba686c 100644 --- a/confluent_osdeploy/esxi7/profiles/hypervisor/kickstart +++ b/confluent_osdeploy/esxi7/profiles/hypervisor/kickstart @@ -4,3 +4,8 @@ install --firstdisk --overwritevmfs %include /tmp/ksnet %include /tmp/rootpw reboot +%post +localcli network firewall unload +STATUP=$(mktemp) +echo '{"status": "complete"}' > $STATUP +/opt/confluent/bin/apiclient /confluent-api/self/updatestatus $STATUP