Merge remote-tracking branch 'xcat'

confluent_client/bin/nodeconsole

@@ -404,6 +404,7 @@ if options.screenshot:
         cursor_down(numrows)
         sys.stdout.write('\n')
     sys.exit(0)
+
 def kill(noderange):
     sess = client.Command()
     envstring=os.environ.get('NODECONSOLE_WINDOWED_COMMAND')
@@ -411,29 +412,23 @@ def kill(noderange):
         envstring = 'xterm'
 
     nodes = []
-    for res in sess.read('/noderange/{0}/nodes/'.format(args[0])):
+    for res in sess.read('/noderange/{0}/nodes/'.format(noderange)):
         node = res.get('item', {}).get('href', '/').replace('/', '')
         if not node:
             sys.stderr.write(res.get('error', repr(res)) + '\n')
             sys.exit(1)
         nodes.append(node) 
 
-    for node in nodes:
-        s=socket.socket(socket.AF_UNIX)
-        winid=None
+    for node in nodes:    
+        command = "ps auxww | grep {0} | grep console | egrep '\\b{1}\\b' | grep -v grep | awk '{{print $2}}'".format(envstring, node)
+        process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        stdout, stderr = process.communicate()
         try:
-            win=subprocess.Popen(['xwininfo', '-tree', '-root'], stdout=subprocess.PIPE)
-            wintr=win.communicate()[0]
-            for line in wintr.decode('utf-8').split('\n'):
-                if 'console: {0}'.format(node) in line or 'confetty' in line:
-                    win_obj = [ele for ele in line.split(' ') if ele.strip()]
-                    winid = win_obj[0]
-        except:
-            print("Error: cannot retrieve window id of node {}".format(node))
-
-        if winid:
-            ps_data=subprocess.Popen(['xkill', '-id', winid ], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
+            process_id = stdout.decode('utf-8').split()[0]
+        except IndexError:
+            sys.stderr.write(node + ": console window not found \n")
+            continue
+        subprocess.Popen(["kill", process_id], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     sys.exit(0)
 
 def handle_geometry(envlist, sizegeometry, side_pad=0, top_pad=0, first=False):    

confluent_osdeploy/el9-diskless/profiles/default/scripts/sample/consoleredirect

@@ -1,15 +0,0 @@
-is_rhel=false
-
-if test -f /boot/efi/EFI/redhat/grub.cfg; then
-    grubcfg="/etc/default/grub"
-    is_rhel=true
-else
-    echo "Expected File missing: Check if os redhat"
-    exit
-fi
-
-# Working on Redhat
-if $is_rhel; then
-    sed -i '/^GRUB_TERMINAL/s/serial //' $grubcfg
-    grub2-mkconfig -o /boot/grub2/grub.cfg
-fi

confluent_osdeploy/suse15/profiles/hpc/scripts/sample/consoleredirect

@@ -1,39 +0,0 @@
-is_suse=false
-
-if test -f /boot/efi/EFI/sle_hpc/grub.cfg; then
-    grubcfg="/boot/efi/EFI/sle_hpc/grub.cfg"
-    grub2-mkconfig -o $grubcfg
-    is_suse=true
-else
-    echo "Expected File missing: Check if os sle_hpc"
-    exit
-fi
-
-# working on SUSE
-if $is_suse; then
-    start=false
-    num_line=0
-    lines_to_edit=()
-    while read line; do
-        ((num_line++))
-        if [[ $line == *"grub_platform"* ]]; then
-            start=true
-        fi
-        if $start; then
-            if [[ $line != "#"* ]];then
-                lines_to_edit+=($num_line)
-            fi
-        fi
-        if [[ ${#line} -eq 2 && $line == *"fi" ]]; then
-            if $start; then
-                start=false
-            fi
-        fi
-    done < grub_cnf.cfg
-
-    for line_num in "${lines_to_edit[@]}"; do
-        line_num+="s"
-        sed -i "${line_num},^,#," $grubcfg
-    done
-    sed -i 's,^terminal,#terminal,' $grubcfg
-fi