Enable more plugins for collective routing

Clarify when things go wrong due to certificate.

confluent_client/COPYRIGHT

@@ -1,21 +0,0 @@
-Name: confluent-client
-Project: https://hpc.lenovo.com/users/
-Source: https://github.com/lenovo/confluent
-
-Files: *
-Copyright: 2014-2019 Lenovo
-License: Apache-2.0
-
-File: client.py:
-Copyright: 2014 IBM Corporation
-           2015-2019 Lenovo
-License: Apache-2.0
-
-File: sortutil.py
-Copyright: 2014 IBM Corporation
-           2015-2016 Lenovo
-License: Apache-2.0
-
-File: tlv.py
-Copyright: 2014 IBM Corporation
-License: Apache-2.0

confluent_client/bin/confetty

@@ -635,7 +635,7 @@ def quitconfetty(code=0, fullexit=False, fixterm=True):
     global didconsole
     if fixterm or didconsole:
         currfl = fcntl.fcntl(sys.stdin.fileno(), fcntl.F_GETFL)
-        fcntl.fcntl(sys.stdin.fileno(), fcntl.F_SETFL, currfl & ~os.O_NONBLOCK)
+        fcntl.fcntl(sys.stdin.fileno(), fcntl.F_SETFL, currfl ^ os.O_NONBLOCK)
         if oldtcattr is not None:
             termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, oldtcattr)
     # Request default color scheme, to undo potential weirdness of terminal

confluent_client/bin/confluent2xcat

@@ -79,8 +79,6 @@ def collect_attribute_data(databynode, node):
     xcatattrs['groups'] = ','.join(data.get('groups', []))
     xcatattrs['bmc'] = data.get('hardwaremanagement.manager', {}).get(
         'value', None)
-    if xcatattrs['bmc']:
-        xcatattrs['bmc'] = xcatattrs['bmc'].split('/', 1)[0]
     xcatattrs['mpa'] = data.get('enclosure.manager', {}).get(
         'value', None)
     xcatattrs['slotid'] = data.get('enclosure.bay', {}).get(

confluent_client/bin/dir2img

@@ -21,17 +21,17 @@ def create_image(directory, image, label=None):
             currsz = (currsz // 512 +1) * 512
             datasz += currsz
     datasz += ents * 32768
-    datasz = datasz // 16384 + 1
+    datasz = datasz // 4096 + 1
     with open(image, 'wb') as imgfile:
-        imgfile.seek(datasz * 16384 - 1)
+        imgfile.seek(datasz * 4096 - 1)
         imgfile.write(b'\x00')
     if label:
         subprocess.check_call(['mformat', '-i', image, '-v', label,
                                '-r', '16', '-d', '1', '-t', str(datasz),
-                               '-s', '16','-h', '2', '::'])
+                               '-s', '4','-h', '2', '::'])
     else:
         subprocess.check_call(['mformat', '-i', image, '-r', '16', '-d', '1', '-t',
-                                str(datasz), '-s', '16','-h', '2', '::'])
+                                str(datasz), '-s', '4','-h', '2', '::'])
     # Some clustered filesystems will have the lock from mformat
     # linger after close (mformat doesn't unlock)
     # do a blocking wait for shared lock and then explicitly

confluent_client/bin/nodeapply

@@ -1,166 +0,0 @@
-#!/usr/bin/python3
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2016-2017 Lenovo
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from collections import deque
-import optparse
-import os
-import select
-import signal
-import subprocess
-import sys
-
-try:
-    signal.signal(signal.SIGPIPE, signal.SIG_DFL)
-except AttributeError:
-    pass
-path = os.path.dirname(os.path.realpath(__file__))
-path = os.path.realpath(os.path.join(path, '..', 'lib', 'python'))
-if path.startswith('/opt'):
-    sys.path.append(path)
-
-import confluent.client as client
-import confluent.sortutil as sortutil
-devnull = None
-
-def run():
-    global devnull
-    devnull = open(os.devnull, 'rb')
-    argparser = optparse.OptionParser(
-        usage="Usage: %prog [options] noderange commandexpression",
-        epilog="Expressions are the same as in attributes, e.g. "
-               "'ipmitool -H {hardwaremanagement.manager}' will be expanded.")
-    argparser.add_option('-f', '-c', '--count', type='int', default=168,
-                         help='Number of commands to run at a time')
-    argparser.add_option('-k', '--security', action='store_true',
-                         help='Update SSH setup')
-    argparser.add_option('-F', '--sync', action='store_true',
-                         help='Run the syncfiles associated with the currently completed OS profile on the noderange')
-    argparser.add_option('-P', '--scripts',
-                         help='Re-run specified scripts, with full path under scripts, e.g. post.d/first,firstboot.d/second')
-    argparser.add_option('-m', '--maxnodes', type='int',
-                    help='Specify a maximum number of '
-                        'nodes to run remote ssh command to, '
-                        'prompting if over the threshold')
-    # among other things, FD_SETSIZE limits.  Besides, spawning too many
-    # processes can be unkind for the unaware on memory pressure and such...
-    #argparser.disable_interspersed_args()
-    (options, args) = argparser.parse_args()
-    if len(args) < 1:
-        argparser.print_help()
-        sys.exit(1)
-    client.check_globbing(args[0])
-    concurrentprocs = options.count
-    c = client.Command()
-
-    currprocs = 0
-    all = set([])
-    pipedesc = {}
-    pendingexecs = deque()
-    exitcode = 0
-
-    c.stop_if_noderange_over(args[0], options.maxnodes)
-    nodemap = {}
-    cmdparms = []
-    nodes = []
-    for res in c.read('/noderange/{0}/nodes/'.format(args[0])):
-        if 'error' in res:
-            sys.stderr.write(res['error'] + '\n')
-            exitcode |= res.get('errorcode', 1)
-            break
-        node = res['item']['href'][:-1]
-        nodes.append(node)
-    
-    cmdstorun = []
-    if options.security:
-        cmdstorun.append(['run_remote', 'setupssh'])
-    if options.sync:
-        cmdstorun.append(['run_remote_python', 'syncfileclient'])
-    if options.scripts:
-        for script in options.scripts.split(','):
-            cmdstorun.append(['run_remote', script])
-    if not cmdstorun:
-        argparser.print_help()
-        sys.exit(1)
-    idxbynode = {}
-    cmdvbase = ['bash', '/etc/confluent/functions']
-    for sshnode in nodes:
-        idxbynode[sshnode] = 1
-        cmdv = ['ssh', sshnode] + cmdvbase + cmdstorun[0]
-        if currprocs < concurrentprocs:
-            currprocs += 1
-            run_cmdv(node, cmdv, all, pipedesc)
-        else:
-            pendingexecs.append((node, cmdv))        
-    if not all or exitcode:
-        sys.exit(exitcode)
-    rdy, _, _ = select.select(all, [], [], 10)
-    while all:
-        pernodeout = {}
-        for r in rdy:
-            desc = pipedesc[r]
-            node = desc['node']
-            data = True
-            while data and select.select([r], [], [], 0)[0]:
-                data = r.readline()
-                if data:
-                    if desc['type'] == 'stdout':
-                        if node not in pernodeout:
-                            pernodeout[node] = []
-                        pernodeout[node].append(data)
-                    else:
-                        data = client.stringify(data)
-                        sys.stderr.write('{0}: {1}'.format(node, data))
-                        sys.stderr.flush()
-                else:
-                    pop = desc['popen']
-                    ret = pop.poll()
-                    if ret is not None:
-                        exitcode = exitcode | ret
-                        all.discard(r)
-                        r.close()
-                        if desc['type'] == 'stdout':
-                            if idxbynode[node] < len(cmdstorun):
-                                cmdv =  ['ssh', sshnode] + cmdvbase + cmdstorun[idxbynode[node]]
-                                idxbynode[node] += 1
-                                run_cmdv(node, cmdv, all, pipedesc)
-                            elif pendingexecs:
-                                node, cmdv = pendingexecs.popleft()
-                                run_cmdv(node, cmdv, all, pipedesc)
-        for node in sortutil.natural_sort(pernodeout):
-            for line in pernodeout[node]:
-                line = client.stringify(line)
-                line = line.lstrip('\x08')
-                sys.stdout.write('{0}: {1}'.format(node, line))
-        sys.stdout.flush()
-        if all:
-            rdy, _, _ = select.select(all, [], [], 10)
-    sys.exit(exitcode)
-
-
-def run_cmdv(node, cmdv, all, pipedesc):
-    nopen = subprocess.Popen(
-        cmdv, stdin=devnull, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    pipedesc[nopen.stdout] = {'node': node, 'popen': nopen,
-                              'type': 'stdout'}
-    pipedesc[nopen.stderr] = {'node': node, 'popen': nopen,
-                              'type': 'stderr'}
-    all.add(nopen.stdout)
-    all.add(nopen.stderr)
-
-
-if __name__ == '__main__':
-    run()

confluent_client/bin/nodeconfig

@@ -90,12 +90,6 @@ cfgpaths = {
     'bmc.ipv4_gateway': (
         'configuration/management_controller/net_interfaces/management',
         'ipv4_gateway'),
-    'bmc.static_ipv6_addresses': (
-        'configuration/management_controller/net_interfaces/management',
-        'static_v6_addresses'),
-    'bmc.static_ipv6_gateway': (
-        'configuration/management_controller/net_interfaces/management',
-        'static_v6_gateway'),
     'bmc.hostname': (
         'configuration/management_controller/hostname', 'hostname'),
 }

confluent_client/bin/nodeconsole

@@ -1,4 +1,4 @@
-#!/usr/libexec/platform-python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015 Lenovo
@@ -23,17 +23,13 @@ path = os.path.dirname(os.path.realpath(__file__))
 path = os.path.realpath(os.path.join(path, '..', 'lib', 'python'))
 if path.startswith('/opt'):
     sys.path.append(path)
-
 import confluent.client as client
 import confluent.sortutil as sortutil
 import confluent.logreader as logreader
-import time
-import socket
-import re
 
 confettypath = os.path.join(os.path.dirname(sys.argv[0]), 'confetty')
 argparser = optparse.OptionParser(
-    usage="Usage: %prog [options] <noderange> [kill][-- [passthroughoptions]]",
+    usage="Usage: %prog [options] node",
     epilog="Command sequences are available while connected to a console, hit "
            "ctrl-'e', then release ctrl, then 'c', then '?' for a full list. "
            "For example, ctrl-'e', then 'c', then '.' will exit the current "
@@ -42,50 +38,10 @@ argparser.add_option('-t', '--tile', action='store_true', default=False,
                      help='Tile console windows in the terminal')
 argparser.add_option('-l', '--log', action='store_true', default=False,
                      help='Enter log replay mode instead of showing a live console')
-
-argparser.add_option('-T', '--Timestamp', action='store_true', default=False,
-                     help= 'Dump log in stdout with timestamps')
-
-argparser.add_option('-w','--windowed', action='store_true', default=False,
-                     help='Open terminal windows for each node.  The '
-                          'environment variable NODECONSOLE_WINDOWED_COMMAND '
-                          'should be set, which should be a text string corresponding '
-                          'to a command that can be used to open a windowed console,'
-                          ' omitting the "nodeconsole <noderange>" part of the '
-                          'command, for example, to open a set of consoles for a '
-                          'range of nodes in separate xterm windows, set '
-                          'NODECONSOLE_WINDOWED_COMMAND to "xterm -e".  To open a '
-                          'set of consoles for a range of nodes in separate '
-                          'GNOME Terminal windows with a size of 100 columns and '
-                          '31 rows, set NODECONSOLE_WINDOWED_COMMAND '
-                          'to "gnome-terminal --geometry 100x31 --" or in a WSL '
-                          'environment, to open a set of consoles for a range of '
-                          'nodes in separate Windows Terminal windows, with the '
-                          'title set for each node, set NODECONSOLE_WINDOWED_COMMAND'
-                          ' to "wt.exe wsl.exe -d AlmaLinux-8 '
-                          '--shell-type login".  If the NODECONSOLE_WINDOWED_COMMAND '
-                          'environment variable isn\'t set, xterm will be used by'
-                          'default.')
-
 (options, args) = argparser.parse_args()
-
-pass_through_args = []
-killcon = False
-try:
-    noderange = args[0]
-    if len(args) > 1:
-        if args[1] == 'kill':
-            killcon = True
-        pass_through_args = args[1:]
-        args = args[:1]
-except IndexError:
-    argparser.print_help()
-    sys.exit(1)
-
 if len(args) != 1:
     argparser.print_help()
     sys.exit(1)
-
 if options.log:
     logname = args[0]
     if not os.path.exists(logname) and logname[0] != '/':
@@ -95,196 +51,6 @@ if options.log:
         sys.exit(1)
     logreader.replay_to_console(logname)
     sys.exit(0)
-
-if options.Timestamp:
-    logname = args[0]
-    if not os.path.exists(logname) and logname[0] != '/':
-        logname = os.path.join('/var/log/confluent/consoles', logname)
-    if not os.path.exists(logname):
-        sys.stderr.write('Unable to locate {0} on local system\n'.format(logname))
-        sys.exit(1)
-    logreader.dump_to_console(logname)
-    sys.exit(0)
-
-def kill(noderange):
-    sess = client.Command()
-    envstring=os.environ.get('NODECONSOLE_WINDOWED_COMMAND')
-    if not envstring:
-        envstring = 'xterm'
-
-    nodes = []
-    for res in sess.read('/noderange/{0}/nodes/'.format(args[0])):
-        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
-        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)
-
-    sys.exit(0)
-
-def handle_geometry(envlist, sizegeometry, side_pad=0, top_pad=0, first=False):    
-    if '-geometry' in envlist:
-        g_index = envlist.index('-geometry')
-    elif '-g' in envlist:
-        g_index = envlist.index('-g')
-    else:
-        g_index = 0
-    if g_index:   
-        if first:
-             envlist[g_index+1] = '{0}+{1}+{2}'.format(envlist[g_index+1],side_pad, top_pad)
-        else:
-            envlist[g_index+1] = '{0}+{1}+{2}'.format(sizegeometry,side_pad, top_pad)
-    else:
-        envlist.insert(1, '-geometry')
-        envlist.insert(2, '{0}+{1}+{2}'.format(sizegeometry,side_pad, top_pad))
-        g_index = 1
-    return envlist     
-
-# add funcltionality to close/kill all open consoles
-if killcon:
-    kill(noderange)
-    
-#added functionality for wcons
-if options.windowed:
-    result=subprocess.Popen(['xwininfo', '-root'], stdout=subprocess.PIPE)
-    rootinfo=result.communicate()[0]
-    result.wait()
-    for line in rootinfo.decode('utf-8').split('\n'):
-        if 'Width' in line:
-            screenwidth = int(line.split(':')[1])
-        if 'Height' in line:
-            screenheight = int(line.split(':')[1])
-
-    envstring=os.environ.get('NODECONSOLE_WINDOWED_COMMAND')
-    if not envstring:
-        sizegeometry='100x31'
-        corrected_x, corrected_y = (13,84)
-        envlist = handle_geometry(['xterm'] + pass_through_args + ['-e'],sizegeometry, first=True)
-        #envlist=['xterm', '-bg', 'black', '-fg', 'white', '-geometry', '{sizegeometry}+0+0'.format(sizegeometry=sizegeometry), '-e']
-    else:
-        envlist=os.environ.get('NODECONSOLE_WINDOWED_COMMAND').split(' ')
-        if envlist[0] == 'xterm':
-            if '-geometry' in envlist:
-                g_index = envlist.index('-geometry')
-            elif '-g' in envlist:
-                g_index = envlist.index('-g')
-            else:
-                g_index = 0
-            if g_index:    
-                envlist[g_index+1] = envlist[g_index+1] + '+0+0'
-
-            else:
-                envlist.insert(1, '-geometry')
-                envlist.insert(2, '100x31+0+0')
-                g_index = 1
-            
-    nodes = []
-    sess = client.Command()
-    for res in sess.read('/noderange/{0}/nodes/'.format(args[0])):
-        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)
-
-    if options.tile and not envlist[0] == 'xterm':
-        sys.stderr.write('[ERROR] UNSUPPORTED OPTIONS. \nWindowed and tiled consoles are only supported when using xterm \n')
-        sys.exit(1)
-    firstnode=nodes[0]
-    nodes.pop(0)
-    with open(os.devnull, 'wb') as devnull:
-        xopen=subprocess.Popen(envlist + [confettypath, '-c', '/tmp/controlpath-{0}'.format(firstnode), '-m', '5', 'start', '/nodes/{0}/console/session'.format(firstnode) ] , stdin=devnull)
-        time.sleep(2)
-        s=socket.socket(socket.AF_UNIX)
-        winid=''
-        try:
-            s.connect('/tmp/controlpath-{firstnode}'.format(firstnode=firstnode))
-            s.recv(64)
-            s.send(b'GETWINID')
-            winid=s.recv(64).decode('utf-8')
-
-        except:
-            time.sleep(2)
-            # try to get id of first panel/xterm window using name
-            win=subprocess.Popen(['xwininfo', '-tree', '-root'], stdout=subprocess.PIPE)
-            wintr=win.communicate()[0]
-            for line in wintr.decode('utf-8').split('\n'):
-                if 'console: {firstnode}'.format(firstnode=firstnode) in line or 'confetty' in line:
-                    win_obj = [ele for ele in line.split(' ') if ele.strip()]
-                    winid = win_obj[0]
-    if winid:
-        firstnode_window=subprocess.Popen(['xwininfo', '-id', '{winid}'.format(winid=winid)], stdout=subprocess.PIPE)
-        xinfo=firstnode_window.communicate()[0]
-        xinfl = xinfo.decode('utf-8').split('\n')
-        for line in xinfl:
-            if 'Absolute upper-left X:' in line:
-                side_pad = int(line.split(':')[1])
-            elif 'Absolute upper-left Y:' in line:
-                top_pad = int(line.split(':')[1])
-
-            elif 'Width:' in line:
-                window_width = int(line.split(':')[1])
-            elif 'Height' in line:
-                window_height = int(line.split(':')[1])
-            elif '-geometry' in line:
-                l = re.split(' |x|-|\+', line)
-                l_nosp = [ele for ele in l if ele.strip()]
-                wmxo = int(l_nosp[1])
-                wmyo = int(l_nosp[2])
-                sizegeometry = str(wmxo) + 'x' + str(wmyo)
-            else:
-                pass
-
-        window_width += side_pad*2
-        window_height += side_pad+top_pad
-        screenwidth -= wmxo
-        screenheight -= wmyo
-        currx = window_width
-        curry = 0
-        maxcol = int(screenwidth/window_width)
-
-    for node in sortutil.natural_sort(nodes):
-        if options.tile and envlist[0] == 'xterm':
-            corrected_x = currx
-            corrected_y = curry
-            xgeometry = '{0}+{1}+{2}'.format(sizegeometry, corrected_x, corrected_y)
-            currx += window_width
-            if currx >= screenwidth:
-                currx=0
-                curry += window_height
-                if curry > screenheight:
-                    curry =top_pad
-            if not envstring:        
-                envlist= handle_geometry(envlist, sizegeometry, corrected_x, corrected_y)
-            else:
-                if g_index:    
-                    envlist[g_index+1] = xgeometry
-        elif envlist[0] == 'xterm':
-            envlist=handle_geometry(envlist, sizegeometry, side_pad, top_pad)
-            side_pad+=(side_pad+1)
-            top_pad+=(top_pad+30)
-        else:
-            pass 
-        with open(os.devnull, 'wb') as devnull:
-            xopen=subprocess.Popen(envlist + [confettypath, '-c', '/tmp/controlpath-{0}'.format(node), '-m', '5', 'start', '/nodes/{0}/console/session'.format(node)] , stdin=devnull)
-    sys.exit(0)
-#end of wcons
 if options.tile:
     null = open('/dev/null', 'w')
     nodes = []
@@ -296,13 +62,8 @@ if options.tile:
             sys.exit(1)
         nodes.append(node)
     initial = True
-    in_tmux = False
     pane = 0
     sessname = 'nodeconsole_{0}'.format(os.getpid())
-    if os.environ.get("TMUX"):
-        initial = False
-        in_tmux = True
-        subprocess.call(['tmux', 'rename-session', sessname])
     for node in sortutil.natural_sort(nodes):
         panename = '{0}:{1}'.format(sessname, pane)
         if initial:
@@ -323,8 +84,7 @@ if options.tile:
             pane += 1
     subprocess.call(['tmux', 'select-pane', '-t', sessname])
     subprocess.call(['tmux', 'set-option', '-t', panename, 'pane-border-status', 'top'], stderr=null)
-    if not in_tmux:
-        os.execlp('tmux', 'tmux', 'attach', '-t', sessname)
+    os.execlp('tmux', 'tmux', 'attach', '-t', sessname)
 else:
     os.execl(confettypath, confettypath, 'start',
              '/nodes/{0}/console/session'.format(args[0]))

confluent_client/bin/nodedeploy

@@ -49,7 +49,7 @@ def armonce(nr, cli):
 
 
 def setpending(nr, profile, cli):
-    args = {'deployment.pendingprofile': profile, 'deployment.state': '', 'deployment.state_detail': ''}
+    args = {'deployment.pendingprofile': profile}
     if not profile.startswith('genesis-'):
         args['deployment.stagedprofile'] = ''
         args['deployment.profile'] = ''
@@ -86,10 +86,6 @@ def main(args):
     c = client.Command()
     c.stop_if_noderange_over(args.noderange, args.maxnodes)
     errnodes = set([])
-    for rsp in c.read('/noderange/{0}/nodes/'.format(args.noderange)):
-        if 'error' in rsp:
-            sys.stderr.write(rsp['error'] + '\n')
-            sys.exit(1)
     if not args.clear and args.network and not args.prepareonly:
         rc = c.simple_noderange_command(args.noderange, '/boot/nextdevice', 'network',
                                         bootmode='uefi',
@@ -132,7 +128,7 @@ def main(args):
                 if node not in databynode:
                     databynode[node] = {}
                 for attr in dbn[node]:
-                    if attr in ('deployment.pendingprofile', 'deployment.apiarmed', 'deployment.stagedprofile', 'deployment.profile', 'deployment.state', 'deployment.state_detail'):
+                    if attr in ('deployment.pendingprofile', 'deployment.apiarmed', 'deployment.stagedprofile', 'deployment.profile'):
                         databynode[node][attr] = dbn[node][attr].get('value', '')
         for node in sortutil.natural_sort(databynode):
             profile = databynode[node].get('deployment.pendingprofile', '')
@@ -153,18 +149,7 @@ def main(args):
                 armed = ' (node authentication armed)'
             else:
                 armed = ''
-            stateinfo = ''
-            deploymentstate = databynode[node].get('deployment.state', '')
-            if deploymentstate:
-                statedetails = databynode[node].get('deployment.state_detail', '')
-                if statedetails:
-                    stateinfo = '{}: {}'.format(deploymentstate, statedetails)
-                else:
-                    stateinfo = deploymentstate
-            if stateinfo:
-                print('{0}: {1} ({2})'.format(node, profile, stateinfo))
-            else:
-                print('{0}: {1}{2}'.format(node, profile, armed))
+            print('{0}: {1}{2}'.format(node, profile, armed))
         sys.exit(0)
     if args.network and not args.prepareonly:
         return rc

confluent_client/bin/nodediscover

@@ -50,52 +50,19 @@ columnmapping = {
 }
 #TODO: add chassis uuid
 
-def register_endpoint(options, session, addr):
-    neednewline = False
-    current = 0
-    for rsp in session.update('/discovery/register', {'addresses': addr}):
-        if 'count' in rsp:
-            total = rsp['count']
-        elif total > 1:
-            current += 1
-            sys.stdout.write('\x1b[2K\r{0:.1f}% Scanned'.format(100 * current / total))
-            sys.stdout.flush()
-            neednewline = True
-        if 'created' in rsp:
-            if neednewline:
-                print('')
-                neednewline = False
-            print('Registered: {0}'.format(rsp['created']))
-    if neednewline:
-        print('')
 
-def subscribe_discovery(options, session, subscribe, targ):
-    keyn = 'subscribe' if subscribe else 'unsubscribe'
-    payload = {keyn: targ}
-    if subscribe:
-        for rsp in session.update('/discovery/subscriptions/{0}'.format(targ), payload):
-            if 'status' in rsp:
-                print(rsp['status'])
-    else:
-        for rsp in session.delete('/discovery/subscriptions/{0}'.format(targ)):
-            if 'status' in rsp:
-                print(rsp['status'])
-    
 def print_disco(options, session, currmac, outhandler, columns):
     procinfo = {}
     for tmpinfo in session.read('/discovery/by-mac/{0}'.format(currmac)):
 
         procinfo.update(tmpinfo)
     if 'Switch' in columns or 'Port' in columns:
-        if 'switch' in procinfo:
-            procinfo['port'] = procinfo['switchport']
-        else:
-            for tmpinfo in session.read(
-                    '/networking/macs/by-mac/{0}'.format(currmac)):
-                if 'ports' in tmpinfo:
-                    # The api sorts so that the most specific available value
-                    # is last
-                    procinfo.update(tmpinfo['ports'][-1])
+        for tmpinfo in session.read(
+                '/networking/macs/by-mac/{0}'.format(currmac)):
+            if 'ports' in tmpinfo:
+                # The api sorts so that the most specific available value
+                # is last
+                procinfo.update(tmpinfo['ports'][-1])
     record = []
     for col in columns:
         rawcol = columnmapping[col]
@@ -353,7 +320,7 @@ def blocking_scan(session):
 
 def main():
     parser = optparse.OptionParser(
-        usage='Usage: %prog [list|assign|rescan|clear|subscribe|unsubscribe|register] [options]')
+        usage='Usage: %prog [list|assign|rescan|clear] [options]')
     # -a for 'address' maybe?
     # order by
     # show state (discovered or..
@@ -391,15 +358,9 @@ def main():
     parser.add_option('-o', '--order', dest='order',
                       help='Order output by given field', metavar='ORDER')
     (options, args) = parser.parse_args()
-    if len(args) == 0 or args[0] not in ('list', 'assign', 'reassign', 'rescan', 'clear', 'subscribe', 'unsubscribe', 'register'):
+    if len(args) == 0 or args[0] not in ('list', 'assign', 'reassign', 'rescan', 'clear'):
         parser.print_help()
         sys.exit(1)
-    if args[0] == 'register' and len(args) != 2:
-        sys.stderr.write('Register requires target address or range (e.g. 192.168.2.30, 192.168.2.0/24, or 192.168.2.1-192.168.2.30)\n')
-        sys.exit(1)
-    if 'subscribe' in args[0] and len(args) != 2:
-        sys.stderr.write('subscribe/unsubscribe subcommands require switch name as argument\n')
-        sys.exit(1)
     session = client.Command()
     if args[0] == 'list':
         list_discovery(options, session)
@@ -409,12 +370,6 @@ def main():
         assign_discovery(options, session)
     if args[0] == 'reassign':
         assign_discovery(options, session, False)
-    if args[0] == 'register':
-        register_endpoint(options, session, args[1])
-    if args[0] == 'subscribe':
-        subscribe_discovery(options, session, True, args[1])
-    if args[0] == 'unsubscribe':
-        subscribe_discovery(options, session, False, args[1])
     if args[0] == 'rescan':
         blocking_scan(session)
         print("Rescan complete")

confluent_client/bin/nodeeventlog

@@ -17,7 +17,6 @@
 
 import codecs
 from datetime import datetime as dt
-from datetime import timedelta
 import optparse
 import os
 import signal
@@ -42,18 +41,7 @@ argparser = optparse.OptionParser(
 argparser.add_option('-m', '--maxnodes', type='int',
                      help='Specify a maximum number of '
                           'nodes to clear if clearing log, '
-                          'prompting if over the threshold')   
-argparser.add_option('-l', '--lines', type='int',
-                     help='return the last <n> entries  '
-                          'for each node in the eventlog. '
-                          )
-argparser.add_option('-t', '--timeframe', type='string',
-                     help='return entries within a specified timeframe  '
-                          'for each node in the eventlog. This will return '
-                          'entries from the last hours or days. '
-                          '1h would be one hour, 4d would be four days. '
-                          'format <num>h or <num>d'
-                          )  
+                          'prompting if over the threshold')            
 (options, args) = argparser.parse_args()
 try:
     noderange = args[0]
@@ -101,34 +89,12 @@ def format_event(evt):
         msg = ''
     return ' '.join(retparts) + msg
 
+
 if deletemode:
     func = session.delete
     session.stop_if_noderange_over(noderange, options.maxnodes)
 else:
     func = session.read
-
-if options.timeframe:
-    try:
-        delta = int(options.timeframe[:-1])
-    except ValueError:
-        argparser.print_help()
-        sys.exit(1)
-    if options.timeframe[-1].lower() == 'd':
-        tdelta = timedelta(days=delta)
-    elif options.timeframe[-1].lower() == 'h':
-        tdelta = timedelta(hours=delta)
-    else:
-        argparser.print_help()
-        sys.exit(1)
-    timeframe = dt.now() - tdelta
-
-event_dict = {}
-nodes = []
-for res in session.read('/noderange/{0}/nodes/'.format(args[0])):
-    node = res.get('item', {}).get('href', '/').replace('/', '')
-    nodes.append(node)
-    event_dict[node] = []
-
 for rsp in func('/noderange/{0}/events/hardware/log'.format(noderange)):
     if 'error' in rsp:
         sys.stderr.write(rsp['error'] + '\n')
@@ -141,31 +107,6 @@ for rsp in func('/noderange/{0}/events/hardware/log'.format(noderange)):
                sys.stderr.write('{0}: {1}\n'.format(node, thisdata['error']))
                exitcode |= 1
             if 'events' in thisdata:
-                evtdata = thisdata['events']
-                if options.lines:
-                    event_dict[node].extend(evtdata)
-                else:
-                    for evt in evtdata:
-                        if options.timeframe:
-                            # check if line is in timeframe 
-                            if 'timestamp' in evt and evt['timestamp'] is not None:
-                                display = dt.strptime(evt['timestamp'], '%Y-%m-%dT%H:%M:%S')
-                                if display > timeframe:                          
-                                    print('{0}: {1}'.format(node, format_event(evt))) 
-                        else:
-                            print('{0}: {1}'.format(node, format_event(evt))) 
-
-if options.lines:
-    for node in nodes:
-        evtdata_list = event_dict[node]
-        if len(evtdata_list) != 0:
-            if len(evtdata_list) > options.lines:
-                evtdata_list = evtdata_list[-abs(options.lines):]
-            for evt in evtdata_list:
-                if options.timeframe:
-                    if 'timestamp' in evt and evt['timestamp'] is not None:
-                        display = dt.strptime(evt['timestamp'], '%Y-%m-%dT%H:%M:%S')
-                        if display > timeframe:                          
-                            print('{0}: {1}'.format(node, format_event(evt)))
-                else:
-                    print('{0}: {1}'.format(node, format_event(evt)))
+               evtdata = thisdata['events']
+               for evt in evtdata:
+                   print('{0}: {1}'.format(node, format_event(evt)))

confluent_client/bin/nodegroupattrib

@@ -60,12 +60,10 @@ nodetype="nodegroups"
 
 try:
     nodegroups = args[0]
-    client.check_globbing(nodegroups)
     nodelist = '/{0}/{1}/'.format(nodetype,nodegroups)
 except IndexError:
-    argparser.print_help()
-    sys.exit(1)
     nodelist = '/nodegroups/'
+client.check_globbing(nodegroups)
 session = client.Command()
 exitcode = 0
 

confluent_client/bin/nodeinventory

@@ -53,8 +53,6 @@ def print_mem_info(node, prefix, meminfo):
         memdescfmt += '3-{1} '
     elif 'DDR4' in meminfo['memory_type']:
         memdescfmt += '4-{1} '
-    elif 'DDR5' in meminfo['memory_type']:
-        memdescfmt += '5-{1} '
     elif 'DCPMM' in meminfo['memory_type']:
         memdescfmt = '{0}GB {1} '
         meminfo['module_type'] = 'DCPMM'
@@ -101,7 +99,6 @@ usedprefixes = set([])
 argparser = optparse.OptionParser(
     usage="Usage: %prog <noderange> [serial|model|uuid|mac]")
 argparser.add_option('-j', '--json', action='store_true', help='Output JSON')
-argparser.add_option('-s', '--store', action='store_true', help='Store serial, model, and uuid into id.serial, id.model, and id.uuid')
 (options, args) = argparser.parse_args()
 try:
     noderange = args[0]
@@ -129,36 +126,17 @@ if len(args) > 1:
 try:
     if options.json:
         databynode = {}
-    if options.store and len(args) <= 1:
-        url = '/noderange/{0}/inventory/hardware/all/system'
-    pushattribs = {}
     session = client.Command()
     for res in session.read(url.format(noderange)):
         printerror(res)
         if 'databynode' not in res:
             continue
         for node in res['databynode']:
-            if options.store and node not in pushattribs:
-                pushattribs[node] = {}
             printerror(res['databynode'][node], node)
             if 'inventory' not in res['databynode'][node]:
                 continue
             for inv in res['databynode'][node]['inventory']:
                 prefix = inv['name']
-                if options.store and prefix == 'System':
-                    currinfo = inv.get('information', {})
-                    curruuid = currinfo.get('UUID', '')
-                    if curruuid:
-                        curruuid = curruuid.lower()
-                        pushattribs[node]['id.uuid'] = curruuid
-                    currserial = currinfo.get('Serial Number', '')
-                    if currserial:
-                        currserial = currserial.strip()
-                        pushattribs[node]['id.serial'] = currserial
-                    currmodelnum = currinfo.get('Model', '')
-                    if currmodelnum:
-                        currmodelnum = currmodelnum.strip()
-                        pushattribs[node]['id.model'] = currmodelnum
                 idx = 2
                 while (node, prefix) in usedprefixes:
                     prefix = '{0} {1}'.format(inv['name'], idx)
@@ -170,7 +148,7 @@ try:
                             if node not in databynode:
                                 databynode[node] = {}
                             databynode[node][prefix] = inv
-                        elif not options.store:
+                        else:
                             print('{0}: {1}: Not Present'.format(node, prefix))
                     continue
                 info = inv['information']
@@ -201,18 +179,12 @@ try:
                             databynode[node] = {}
                         databynode[node][prefix] = inv
                         break
-                    elif not options.store:
-                        print(u'{0}: {1} {2}: {3}'.format(node, prefix,
-                                                         pretty(datum),
-                                                         info[datum]))
+                    print(u'{0}: {1} {2}: {3}'.format(node, prefix,
+                                                     pretty(datum),
+                                                     info[datum]))
     if options.json:
         print(json.dumps(databynode, sort_keys=True, indent=4,
                          separators=(',', ': ')))
-    if pushattribs:
-        for node in pushattribs:
-            for rsp in session.update('/nodes/{0}/attributes/current'.format(node), pushattribs[node]):
-                if 'error' in rsp:
-                    sys.stderr.write(rsp['error'] + '\n')
 except KeyboardInterrupt:
     print('')
 sys.exit(exitcode)

confluent_client/bin/nodelist

@@ -1,4 +1,4 @@
-#!/usr/libexec/platform-python
+#!/usr/bin/python2
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2015-2017 Lenovo
@@ -15,15 +15,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__author__ = 'jjohnson2,alin37,wgrzeda'
+__author__ = 'jjohnson2,alin37'
 
 import optparse
 import os
 import signal
 import sys
 
-
-
 try:
     signal.signal(signal.SIGPIPE, signal.SIG_DFL)
 except AttributeError:
@@ -41,12 +39,9 @@ def main():
           "   or: %prog [options] noderange <nodeattribute>...")
     argparser.add_option('-b', '--blame', action='store_true',
                      help='Show information about how attributes inherited')
-    argparser.add_option('-d', '--delim', metavar="STRING", default = "\n",
-                     help='Delimiter separating the values')
     (options, args) = argparser.parse_args()
     noderange=""
     nodelist=""
-    list = []
     try:
         noderange = args[0]
         nodelist = '/noderange/{0}/nodes/'.format(noderange)
@@ -66,9 +61,7 @@ def main():
                 sys.stderr.write(res['error'] + '\n')
                 exitcode = 1
             else:
-                elem=(res['item']['href'].replace('/', ''))
-                list.append(elem)
-    print(options.delim.join(list))
+                print(res['item']['href'].replace('/', ''))
 
     sys.exit(exitcode)
 

confluent_client/bin/nodersync

@@ -46,8 +46,6 @@ def run():
                      help='Specify a maximum number of '
                           'nodes to run rsync to, '
                           'prompting if over the threshold')   
-    argparser.add_option('-l', '--loginname', type='str',
-                         help='Username to use when connecting, defaults to current user.')
     argparser.add_option('-f', '-c', '--count', type='int', default=168,
                          help='Number of nodes to concurrently rsync')
     # among other things, FD_SETSIZE limits.  Besides, spawning too many
@@ -63,10 +61,7 @@ def run():
     c = client.Command()
     cmdstr = ' '.join(args[:-1])
     cmdstr = 'rsync -av --info=progress2 ' + cmdstr
-    if options.loginname:
-        cmdstr += ' {}@'.format(options.loginname) + '{node}:' + targpath
-    else:
-        cmdstr += ' {node}:' + targpath
+    cmdstr += ' {node}:' + targpath
 
     currprocs = 0
     all = set([])

confluent_client/bin/nodesensors

@@ -37,12 +37,6 @@ class hybridcsv(csv.excel):
     lineterminator = '\n'
 
 
-def floatformat(num):
-    fm = u'{:.5f}'.format(num).rstrip('0')
-    if fm[-1:] == u'.':
-        return fm + u'0'
-    return fm
-
 csv.register_dialect('hybrid', hybridcsv)
 
 import confluent.client as client
@@ -141,7 +135,7 @@ def sensorpass(showout=True, appendtime=False):
                         if sensedata['value'] is None:
                             showval = ''
                         elif isinstance(sensedata['value'], float):
-                            showval = u' {0} '.format(floatformat(sensedata['value']))
+                            showval = u' {0:.5f} '.format(sensedata['value'])
                         else:
                             showval = u' {0} '.format(sensedata['value'])
                         if sensedata['units'] not in (None, u''):
@@ -197,8 +191,6 @@ def format_csv(csvwriter, orderedsensors, resdata, showtime=True):
                             datum = ','.join([datum, healthstates])
                         else:
                             datum = healthstates
-                if isinstance(datum, float):
-                    datum = floatformat(datum)
                 rowdata.append(datum)
             except KeyError:
                 rowdata.append('N/A')

confluent_client/confluent/logreader.py

@@ -282,61 +282,14 @@ def _replay_to_console(txtfile, binfile):
 def replay_to_console(txtfile):
     if os.path.exists(txtfile + '.cbl'):
         binfile = txtfile + '.cbl'
-    elif '.' not in txtfile:
-        if '/' not in txtfile:
-            txtfile = os.getcwd() + '/' + txtfile
-        sys.stderr.write('Unable to locate cbl file: "{0}"\n'.format(txtfile + '.cbl'))
-        sys.exit(1)
     else:
         fileparts = txtfile.split('.')
         prefix = '.'.join(fileparts[:-1])
         binfile = prefix + '.cbl.' + fileparts[-1]
         if not os.path.exists(binfile):
-            sys.stderr.write('Unable to locate cbl file: "{0}"\n'.format(binfile))
+            sys.stderr.write('Unable to locate cbl file\n')
             sys.exit(1)
     _replay_to_console(txtfile, binfile)
 
-def dump_to_console(txtfile):
-    if os.path.exists(txtfile + '.cbl'):
-        binfile = txtfile + '.cbl'
-    elif '.' not in txtfile:
-        if '/' not in txtfile:
-            txtfile = os.getcwd() + '/' + txtfile
-        sys.stderr.write('Unable to locate cbl file: "{0}"\n'.format(txtfile + '.cbl'))
-        sys.exit(1)
-    else:
-        fileparts = txtfile.split('.')
-        prefix = '.'.join(fileparts[:-1])
-        binfile = prefix + '.cbl.' + fileparts[-1]
-        if not os.path.exists(binfile):
-            sys.stderr.write('Unable to locate cbl file: "{0}"\n'.format(binfile))
-            sys.exit(1)
-    replay = LogReplay(txtfile, binfile)
-    quitit = False
-    writeout('\x1b[2J\x1b[;H')
-    prepend = ''
-    try:
-        while not quitit:
-            newdata, delay = replay.get_output(False)
-            if newdata:
-                if prepend:
-                    newdata = prepend + newdata
-                    prepend = b''
-                writeout(newdata.replace(b'\r\n', '\r\n[ {0} ] '.format(time.strftime('%m/%d %H:%M:%S', time.localtime(replay.laststamp))).encode('utf8')))
-                newdata = ''
-                try:
-                    if hasattr(sys.stdout, 'buffer'):
-                        sys.stdout.buffer.flush()
-                    else:
-                        sys.stdout.flush()
-                except IOError:
-                    pass
-            else:
-                break
-    except Exception:
-        writeout('\x1b[m\x1b[?25h\n')
-        raise
-    writeout('\x1b[m\x1b[?25h\n')
-
 if __name__ == '__main__':
-    replay_to_console(sys.argv[1])
+    replay_to_console(sys.argv[1])

confluent_client/confluent/screensqueeze.py

@@ -29,9 +29,6 @@ class ScreenPrinter(object):
         self.client = client
         self.nodeoutput = {}
         self.nodelist = []
-        self.nodepos = {}
-        self.lastrows = 0
-        self.fieldchanged = False
         maxlen = 0
         for ans in self.client.read('/noderange/{0}/nodes/'.format(noderange)):
             if 'error' in ans:
@@ -53,19 +50,16 @@ class ScreenPrinter(object):
         if len(text) >= self.textlen:
             self.textlen = len(text) + 1
             self.fieldwidth = self.textlen + self.nodenamelen + 1
-            self.fieldchanged = True
-        self.drawscreen(node)
+        self.drawscreen()
 
-    def drawscreen(self, node=None):
+    def drawscreen(self):
         if self.squeeze:
             currheight, currwidth = get_screengeom()
-            currheight -= 2
-            if currheight < 1:
-                currheight = 1
+            currheight -= 1
             numfields = currwidth // self.fieldwidth
             fieldformat = '{{0:>{0}}}:{{1:{1}}}'.format(self.nodenamelen,
                                                         self.textlen)
-            #sys.stdout.write('\x1b[2J\x1b[;H')  # clear screen
+            sys.stdout.write('\x1b[2J\x1b[;H')  # clear screen
             if len(self.nodelist) < (numfields * currheight):
                 numfields = len(self.nodelist) // currheight + 1
         else:
@@ -73,40 +67,16 @@ class ScreenPrinter(object):
             fieldformat = '{0}: {1}'
         if self.squeeze:
             columns = [self.nodelist[x:x+currheight] for x in range(0, len(self.nodelist), currheight)]
-            if self.lastrows:
-                sys.stdout.write('\x1b[{0}A'.format(self.lastrows))
-            if node and self.lastrows == len(columns[0]) and not self.fieldchanged:
-                targline, targcol = self.nodepos[node]
-                if targline:
-                    sys.stdout.write('\x1b[{0}B'.format(targline))
-                if targcol:
-                    sys.stdout.write('\x1b[{0}C'.format(targcol))
-                sys.stdout.write(fieldformat.format(node, self.nodeoutput[node]))
-                sys.stdout.write('\r\x1b[{0}B'.format(self.lastrows - targline))
-            else:
-                self.lastrows = 0
-                self.fieldchanged = False
-                column = 0
-                for currow in range(0, len(columns[0])):
-                    sys.stdout.write('\x1b[2K')
-                    for col in columns:
-                        try:
-                            node = col[currow]
-                            self.nodepos[node] = (currow, column)
-                            sys.stdout.write(fieldformat.format(node, self.nodeoutput[node]))
-                            column += len(fieldformat.format(node, self.nodeoutput[node]))
-                        except IndexError:
-                            break
-                    sys.stdout.write('\n')
-                    column = 0
-                    self.lastrows += 1
-                sys.stdout.write('\x1b[J')
+            for currow in range(0, len(columns[0])):
+                for col in columns:
+                    try:
+                        node = col[currow]
+                        sys.stdout.write(fieldformat.format(node, self.nodeoutput[node]))
+                    except IndexError:
+                        break
+                sys.stdout.write('\n')
         else:
-            if node:
-                nodes = [node]
-            else:
-                nodes = self.nodelist
-            for node in nodes:
+            for node in self.nodelist:
                 sys.stdout.write(fieldformat.format(node, self.nodeoutput[node]))
                 sys.stdout.write('\n')
         sys.stdout.flush()

confluent_client/confluent_client.spec.tmpl

@@ -12,8 +12,8 @@ Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Prefix: %{_prefix}
 BuildArch: noarch
-Vendor: Lenovo
-Url: http://github.com/lenovo/confluent
+Vendor: Jarrod Johnson <jjohnson2@lenovo.com>
+Url: http://xcat.sf.net/
 Obsoletes: confluent_common
 
 %description
@@ -24,17 +24,25 @@ a confluent server.
 %setup -n %{name}-%{version} -n %{name}-%{version}
 
 %build
-%if "%{dist}" == ".el7"
-python2 setup.py build
-%else
+%if "%{dist}" == ".el8"
 python3 setup.py build
+%else
+%if "%{dist}" == ".el9"
+python3 setup.py build
+%else
+python2 setup.py build
+%endif
 %endif
 
 %install
-%if "%{dist}" == ".el7"
-python2 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-scripts=/opt/confluent/bin --install-purelib=/opt/confluent/lib/python
-%else
+%if "%{dist}" == ".el8"
 python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-scripts=/opt/confluent/bin --install-purelib=/opt/confluent/lib/python
+%else
+%if "%{dist}" == ".el9"
+python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-scripts=/opt/confluent/bin --install-purelib=/opt/confluent/lib/python
+%else
+python2 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-scripts=/opt/confluent/bin --install-purelib=/opt/confluent/lib/python
+%endif
 %endif
 
 
@@ -43,6 +51,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f INSTALLED_FILES
 %license /opt/confluent/share/licenses/confluent_client/LICENSE
-%license /opt/confluent/share/licenses/confluent_client/COPYRIGHT
 %defattr(-,root,root)
-/opt/confluent

confluent_client/confluent_env.sh

@@ -82,17 +82,6 @@ function _confluent_generic_completion()
         return;
     fi
 }
-function _confluent_generic_ng_completion()
-{
-    _confluent_get_args
-    if [ $NUMARGS -ge 3 ] && [ ! -z "$GENNED" ]; then
-        COMPREPLY=($(compgen -W "$GENNED" -- ${COMP_WORDS[COMP_CWORD]}))
-    fi
-    if [ $NUMARGS -lt 3 ]; then
-        _confluent_ng_completion
-        return;
-    fi
-}
 _confluent_nodeidentify_completion()
 {
     COMP_CANDIDATES=("on,off,blink -h")
@@ -153,7 +142,7 @@ _confluent_osimage_completion()
 {
     _confluent_get_args
     if [ $NUMARGS == 2 ]; then
-        COMPREPLY=($(compgen -W "initialize import updateboot rebase" -- ${COMP_WORDS[COMP_CWORD]}))
+        COMPREPLY=($(compgen -W "initialize import updateboot" -- ${COMP_WORDS[COMP_CWORD]}))
         return
     elif [ ${CMPARGS[1]} == 'initialize' ]; then
         COMPREPLY=($(compgen -W "-h -u -s -t -i" -- ${COMP_WORDS[COMP_CWORD]}))
@@ -161,7 +150,7 @@ _confluent_osimage_completion()
         compopt -o default
         COMPREPLY=()
         return
-    elif [ ${CMPARGS[1]} == 'updateboot' -o ${CMPARGS[1]} == 'rebase' ]; then
+    elif [ ${CMPARGS[1]} == 'updateboot' ]; then
         COMPREPLY=($(compgen -W "-n $(confetty show /deployment/profiles|sed -e 's/\///')" -- "${COMP_WORDS[COMP_CWORD]}"))
         return
     fi
@@ -279,20 +268,7 @@ _confluent_nodeattrib_completion()
     _confluent_generic_completion
 }
 
-_confluent_define_completion()
-{
-    COMP_CANDIDATES=$(nodegroupattrib 'everything' all | awk '{print $2}'|sed -e 's/://')
-    _confluent_get_args
-    if [ $NUMARGS -ge 3 ] && [ ! -z "$GENNED" ]; then
-        COMPREPLY=($(compgen -W "$GENNED" -- ${COMP_WORDS[COMP_CWORD]}))
-    fi
-}
 
-_confluent_nodegroupattrib_completion()
-{
-    COMP_CANDIDATES=$(nodegroupattrib 'everything' all | awk '{print $2}'|sed -e 's/://')
-    _confluent_generic_ng_completion
-}
 _confluent_nn_completion()
 {
     _confluent_get_args
@@ -347,30 +323,18 @@ _confluent_ng_completion()
 
     COMPREPLY=($(compgen -W "$(confetty show /nodegroups|sed -e 's/\///' -e s/^/$PREFIX/)" -- "${COMP_WORDS[COMP_CWORD]}"))
 }
-
-_confluent_nodediscover_completion()
-{
-        _confluent_get_args
-        if [ $NUMARGS == 2 ]; then
-            COMPREPLY=($(compgen -W "list assign rescan clear subscribe unsubscribe register" -- ${COMP_WORDS[COMP_CWORD]}))
-            return;
-        fi
-
-}
-complete -F _confluent_nodediscover_completion nodediscover
 complete -F _confluent_nodeattrib_completion nodeattrib
+complete -F _confluent_nodeattrib_completion nodegroupattrib
 complete -F _confluent_nr_completion nodebmcreset
 complete -F _confluent_nodesetboot_completion nodeboot
 complete -F _confluent_nr_completion nodeconfig
 complete -F _confluent_nn_completion nodeconsole
-complete -F _confluent_define_completion nodedefine
-complete -F _confluent_define_completion nodegroupdefine
 complete -F _confluent_nr_completion nodeeventlog
 complete -F _confluent_nodefirmware_completion nodefirmware
 complete -F _confluent_nodedeploy_completion nodedeploy
 complete -F _confluent_osimage_completion osdeploy
 complete -F _confluent_imgutil_completion imgutil
-complete -F _confluent_nodegroupattrib_completion nodegroupattrib
+complete -F _confluent_ng_completion nodegroupattrib
 complete -F _confluent_ng_completion nodegroupremove
 complete -F _confluent_nr_completion nodehealth
 complete -F _confluent_nodeidentify_completion nodeidentify

confluent_client/doc/man/confluent2hosts.ronn

@@ -1,28 +0,0 @@
-confluent2hosts(8) -- Generate /etc/hosts entries for nodes
-========================================================
-
-## SYNOPSIS
-
-`confluent2hosts -i <ip expression> -n <name expression> <noderange>`  
-`confluent2hosts -a <noderange>`  
-
-## DESCRIPTION
-
-`confluent2hosts` can be used to help generate /etc/hosts entries for a 
-noderange.  There are two general approaches.
-
-It can be used ad-hoc, using -i and -n to specify the address and name portions respectively.  This accepts the standard confluent expression syntax, allowing for things like 172.30.1.{n1} or {node}.{dns.domain} or {bmc}.
-
-It can also read from the confluent db, using `-a`.  In this mode, each net.<value>.<attribute> group is pulled together into hosts lines.  ipv4_address and ipv6_address fields are associated with the corresponding hostname attributes.
-
-## EXAMPLES
-
-* Generate /etc/hosts entries ad-hoc using default name:
-  `# confluent2hosts -i 10.2.3.{n1} d9-d12`  
-
-* Generate /etc/hosts entries ad-hoc using alternative name:
-  `# confluent2hosts -i 10.2.3.{n1} -n "{node}-alt {node}-alt.{dns.domain}" d9-d12`  
-
-* Generate /etc/hosts entries using the confluent DB as a reference:
-  `# confluent2hosts -a d9-d12`  
-

confluent_client/doc/man/nodeattrib.ronn.tmpl

@@ -83,12 +83,12 @@ to a blank value will allow masking a group defined attribute with an empty valu
     `# nodeattrib n1,n2 hardwaremanagement --blame`  
     `n1: hardwaremanagement.manager: 172.30.3.1`  
     `n1: hardwaremanagement.method: ipmi (inherited from group everything)`  
-    `n1: net.switch: r8e1`  
-    `n1: net.switchport: 14`  
+    `n1: hardwaremanagement.switch: r8e1`  
+    `n1: hardwaremanagement.switchport: 14`  
     `n2: hardwaremanagement.manager: 172.30.3.2`  
     `n2: hardwaremanagement.method: ipmi (inherited from group everything)`  
-    `n2: net.switch: r8e1`  
-    `n2: net.switchport: 2`  
+    `n2: hardwaremanagement.switch: r8e1`  
+    `n2: hardwaremanagement.switchport: 2`  
 
 * Listing matching nodes of a simple noderange that are set:
     `# nodeattrib n1-n2 current`  

confluent_client/doc/man/nodeconsole.ronn

@@ -2,7 +2,7 @@ nodeconsole(8) -- Open a console to a confluent node
 =====================================================
 
 ## SYNOPSIS
-`nodeconsole [options] <noderange> [kill][-- [passthroughoptions]]`
+`nodeconsole [options] <noderange>`
 
 ## DESCRIPTION
 
@@ -16,9 +16,6 @@ will initiate an automatic retry interval that is randomized between 2 and 4 min
 The reopen escape sequence below requests an immediate retry, as does connecting
 a new session.
 
-When a windowed console is open the `nodeconsole <noderange> kill` command will kill the
-console process which will result in the console window closing. 
-
 ## OPTIONS
 
 * `-t`, `--tile`:
@@ -30,31 +27,6 @@ console process which will result in the console window closing.
   If in collective mode, this only makes sense to use on the current collective
   manager at this time.
 
-  * `-T`, `--Timestamp`:
- Dump the log with Timpstamps on the current, local log in /var/log/confluent/consoles.
-  If in collective mode, this only makes sense to use on the current collective
-  manager at this time.
-  
-* `-w`, `--windowed`:
-  Open terminal windows for each node.  The
-  environment variable **NODECONSOLE_WINDOWED_COMMAND**
-  should be set, which should be a text string corresponding
-  to a command that can be used to open a windowed console,
-  omitting the `nodeconsole <noderange>` part of the
-  command, for example, to open a set of consoles for a
-  range of nodes in separate xterm windows, set
-  **NODECONSOLE_WINDOWED_COMMAND** to `xterm -e`.  To open a
-  set of consoles for a range of nodes in separate
-  GNOME Terminal windows with a size of 100 columns and
-  31 rows, set **NODECONSOLE_WINDOWED_COMMAND**
-  to `gnome-terminal --geometry 100x31 --` or in a WSL
-  environment, to open a set of consoles for a range of
-  nodes in separate Windows Terminal windows, with the
-  title set for each node, set **NODECONSOLE_WINDOWED_COMMAND**
-  to `wt.exe wsl.exe -d AlmaLinux-8 --shell-type login.  If the
-  NODECONSOLE_WINDOWED_COMMAND environment variable isn't set,
-  xterm will be used bydefault.
-
 ## ESCAPE SEQUENCE COMMANDS
 
 While connected to a console, a number of commands may be performed through escape
@@ -94,14 +66,3 @@ keystroke will be interpreted as a command.  The following commands are availabl
   Get a list of supported commands
 * `<ent>`:
   Hit enter to skip entering a command at the escape prompt.
-
-
-## PASSTHROUGH OPTIONS
-
-While opening a windowed console with xterm or any other console of choice. The 
-nodeconsole command gives capality to specify passthrough options targeted at 
-the console. All options after the -- will be parsed the console program. For 
-example, opening a windowed console using xterm with a black background. 
-`nodeconconsole -w n1 -- -bg black`  
-
-

confluent_client/doc/man/nodediscover.ronn

@@ -5,12 +5,9 @@ nodediscover(8)  -- List or manage confluent node discovery
 
 `nodediscover rescan`  
 `nodediscover [options] list`  
-`nodediscover [options] assign`  
-`nodediscover [options] rescan`  
-`nodediscover [options] clear`  
-`nodediscover [options] subscribe [switch]`  
-`nodediscover [options] unsubscribe [switch]`  
-`nodediscover [options] register [Addresses, e.g. 192.168.1.2 or 192.168.1.0/24 or 192.168.1.1-192.168.1.28]`  
+`nodediscover [options] assign`
+`nodediscover [options] rescan`
+`nodediscover [options] clear`
 
 ## DESCRIPTION
 
@@ -38,12 +35,6 @@ scan is the best approach to catch something that appears to be missing.
 **nodedsicover clear** requests the server forget about a selection of
 detected device.  It takes the same arguments as **nodediscover list**.
 
-**nodediscover subscribe** and **unsubscribe** instructs confluent to subscribe to or
-unsubscribe from the designated switch running affluent with system discovery support.
-
-**nodediscover register** instructs confluent to perform a remote probe of an address, subnet,
-or range of IP addresses.
-
 ## CSV FORMAT
 
 The CSV format used by nodediscover consists of one header describing the

confluent_client/doc/man/nodeeventlog.ronn

@@ -15,15 +15,6 @@ noderange.
 * `-m MAXNODES`, `--maxnodes=MAXNODES`:
   Specify a maximum number of nodes to clear if clearing log, prompting if 
   over the threshold 
-
-* `-l LINES`, `--lines=LINES`:
-    return the last <n> entries for each node in the eventlog. 
-
-* `-t TIMEFRAME`, `--timeframe=TIMEFRAME`:
-   return entries within a specified timeframe for each node's event log. 
-   This will return entries from the last <n> hours or days. 1h would be 
-   entries from with the last one hour. 
-                           
   
 * `-h`, `--help`:
   Show help message and exit  

confluent_client/doc/man/nodelist.ronn

@@ -4,7 +4,7 @@ nodelist(8) -- List confluent nodes and their attributes
 ## SYNOPSIS
 
 `nodelist <noderange>`  
-`nodelist <noderange> [-b] [-d] {string} <nodeattribute>...`  
+`nodelist <noderange> [-b] <nodeattribute>...`  
 
 ## DESCRIPTION
 
@@ -24,8 +24,7 @@ all attributes that begin with `net.` and end with `switch`.
 
 * `-b`, `--blame`:
   Annotate inherited and expression based attributes to show their base value.
-* `-d`, `--delim`:
-  Choose a delimiter to separat the values. Default - ENTER.
+
 ## EXAMPLES
 * Listing matching nodes of a simple noderange:
   `# nodelist n1-n4`  

confluent_client/doc/man/osdeploy.ronn

@@ -5,7 +5,6 @@ osdeploy(8) --- Configure general OS deployment facilities of confluent
 
 `osdeploy import <iso>`  
 `osdeploy updateboot <profile>`  
-`osdeploy rebase <profile>`  
 `osdeploy initialize [-h] [-g] [-u] [-s] [-k] [-t] [-p] [-i] [-l] [-a]`  
 
 ## DESCRIPTION
@@ -14,6 +13,5 @@ osdeploy(8) --- Configure general OS deployment facilities of confluent
 `import` subcommand will generate profiles from an iso image. `updateboot` will take any
 changes in the specified update that need to be pushed into boot configuration and/or images
 and ensure those needed changes are performed. `initialize` provides assistance in setting
-up the most commonly required facilities. `rebase` has confluent attempt to update profile
-content that came from /opt/confluent in an rpm update, if profile supports it. 
-Run `osdeploy initialize -h` for more detail on the options offered by `osdeploy initialize`.
+up the most commonly required facilities. Run `osdeploy initialize -h` for more detail
+on the options offered by `osdeploy initialize`

confluent_client/setup.py.tmpl

@@ -2,7 +2,7 @@ from setuptools import setup
 import os
 
 data_files = [('/etc/profile.d', ['confluent_env.sh', 'confluent_env.csh']),
-              ('/opt/confluent/share/licenses/confluent_client/', ['LICENSE', 'COPYRIGHT'])
+              ('/opt/confluent/share/licenses/confluent_client/', ['LICENSE'])
               ]
 try:
     scriptlist = ['bin/{0}'.format(d) for d in os.listdir('bin/')]
@@ -15,14 +15,10 @@ except OSError:
 setup(
     name='confluent_client',
     version='#VERSION#',
-    author='Lenovo',
+    author='Jarrod Johnson',
     author_email='jjohnson2@lenovo.com',
-    url='http://github.com/lenovo/confluent/',
-    license='Apache-2.0',
-    description='Command line client and libraries for confluent management server',
-    long_description='Command line client and libraries for confluent management server',
+    url='http://xcat.sf.net/',
     packages=['confluent'],
-    platforms=['Linux'],
     scripts=scriptlist,
     data_files=data_files,
 )

confluent_osdeploy/buildrpm

@@ -11,24 +11,13 @@ mv confluent_osdeploy.tar.xz ~/rpmbuild/SOURCES/
 cd -
 mkdir -p el9bin/opt/confluent/bin
 mkdir -p el9bin/stateless-bin
-podman run --privileged --rm -v $(pwd)/utils:/buildutils -i -t fedorabuild make -C /buildutils
+podman run --privileged --rm -v $(pwd)/utils:/buildutils -i -t fedorabuilder make -C /buildutils
 cd utils
-cp confluent_imginfo copernicus clortho autocons ../el9bin/opt/confluent/bin
-cp start_root urlmount ../el9bin/stateless-bin/
-make clean
-cd ..
-mkdir -p el8bin/opt/confluent/bin
-mkdir -p el8bin/stateless-bin
-podman run --privileged --rm -v $(pwd)/utils:/buildutils -i -t el7build make -C /buildutils
-cd utils
-cp confluent_imginfo copernicus clortho autocons ../el8bin/opt/confluent/bin
-cp start_root urlmount ../el8bin/stateless-bin/
+mv confluent_imginfo copernicus clortho autocons ../el9bin/opt/confluent/bin
+mv start_root urlmount ../el9bin/stateless-bin/
 make clean
 cd ..
 tar Jcvf confluent_el9bin.tar.xz el9bin/
-tar Jcvf confluent_el8bin.tar.xz el8bin/
-mv confluent_el8bin.tar.xz ~/rpmbuild/SOURCES/
 mv confluent_el9bin.tar.xz ~/rpmbuild/SOURCES/
 rm -rf el9bin
-rm -rf el8bin
 rpmbuild -ba confluent_osdeploy.spec

confluent_osdeploy/buildrpm-aarch64

@@ -1,32 +0,0 @@
-VERSION=`git describe|cut -d- -f 1`
-NUMCOMMITS=`git describe|cut -d- -f 2`
-if [ "$NUMCOMMITS" != "$VERSION"  ]; then
-    VERSION=$VERSION.dev$NUMCOMMITS.g`git describe|cut -d- -f 3`
-fi
-sed -e "s/#VERSION#/$VERSION/" confluent_osdeploy-aarch64.spec.tmpl > confluent_osdeploy-aarch64.spec
-cd ..
-cp ../LICENSE .
-tar Jcvf confluent_osdeploy.tar.xz confluent_osdeploy
-mv confluent_osdeploy.tar.xz ~/rpmbuild/SOURCES/
-cd -
-mkdir -p el9bin/opt/confluent/bin
-mkdir -p el9bin/stateless-bin
-mkdir -p el8bin/opt/confluent/bin
-mkdir -p el8bin/stateless-bin
-podman run --privileged --rm -v $(pwd)/utils:/buildutils -i -t el9builder make -C /buildutils
-cd utils
-mv confluent_imginfo copernicus clortho autocons ../el9bin/opt/confluent/bin
-mv start_root urlmount ../el9bin/stateless-bin/
-cd ..
-podman run --privileged --rm -v $(pwd)/utils:/buildutils -i -t el8builder make -C /buildutils
-cd utils
-mv confluent_imginfo copernicus clortho autocons ../el8bin/opt/confluent/bin
-mv start_root urlmount ../el8bin/stateless-bin/
-cd ..
-tar Jcvf confluent_el9bin.tar.xz el9bin/
-tar Jcvf confluent_el8bin.tar.xz el8bin/
-mv confluent_el8bin.tar.xz ~/rpmbuild/SOURCES/
-mv confluent_el9bin.tar.xz ~/rpmbuild/SOURCES/
-rm -rf el9bin
-rm -rf el8bin
-rpmbuild -ba confluent_osdeploy-aarch64.spec

confluent_osdeploy/common/initramfs/opt/confluent/bin/apiclient

@@ -21,10 +21,6 @@ class InvalidApiKey(Exception):
 def msg_align(len):
     return (len + 3) & ~3
 
-try:
-    _protoparm = ssl.PROTOCOL_TLS_CLIENT
-except AttributeError:    
-    _protoparm = ssl.PROTOCOL_SSLv23
 cryptname = ctypes.util.find_library('crypt')
 if not cryptname:
     if os.path.exists('/lib64/libcrypt.so.2') or os.path.exists('/usr/lib64/libcrypt.so.2'):
@@ -163,7 +159,6 @@ def get_net_apikey(nodename, mgr):
             else:
                 cliaddr = ('::', 302)
             clisock.bind(cliaddr)
-            clisock.settimeout(1)
             clisock.connect(addrinfo[-1])
             rsp = clisock.recv(8)
             if rsp != b'\xc2\xd1-\xa8\x80\xd8j\xba':
@@ -227,8 +222,7 @@ def get_apikey(nodename, hosts, errout=None):
     return apikey
 
 class HTTPSClient(client.HTTPConnection, object):
-    def __init__(self, usejson=False, port=443, host=None, errout=None, phmac=None, checkonly=False):
-        self.phmac = phmac
+    def __init__(self, usejson=False, port=443, host=None, errout=None):
         self.errout = None
         if errout:
             self.errout = open(errout, 'w')
@@ -249,35 +243,24 @@ class HTTPSClient(client.HTTPConnection, object):
             self.hosts = []
             info = open('/etc/confluent/confluent.info').read().split('\n')
             havedefault = '0'
-            plainhost = ''
             for line in info:
-                host = ''
                 if line.startswith('NODENAME:'):
                     node = line.split(' ')[1]
                     self.stdheaders['CONFLUENT_NODENAME'] = node
                 if line.startswith('MANAGER:') and not host:
                     host = line.split(' ')[1]
-                    self.hosts.append(host)
-                    if not plainhost:
-                        plainhost = host
                 if line.startswith('EXTMGRINFO:'):
                     extinfo = line.split(' ')[1]
                     extinfo = extinfo.split('|')
-                    if havedefault == '0' and extinfo[2] == '1':
-                        host, mgtiface, havedefault = extinfo[:3]
-                        if '%' in host:
-                            ifidx = host.split('%', 1)[1]
-                            with open('/tmp/confluent.ifidx', 'w+') as ifout:
-                                ifout.write(ifidx)    
                     if not mgtiface:
                         host, mgtiface, havedefault = extinfo[:3]
-                    if host:
-                        if havedefault == '0':
-                            if '%' in host:
-                                ifidx = host.split('%', 1)[1]
-                                with open('/tmp/confluent.ifidx', 'w+') as ifout:
-                                    ifout.write(ifidx)
-                        self.hosts.append(host)
+                    if havedefault == '0' and extinfo[2] == '1':
+                        host, mgtiface, havedefault = extinfo[:3]
+            if '%' in host:
+                ifidx = host.split('%', 1)[1]
+                with open('/tmp/confluent.ifidx', 'w+') as ifout:
+                    ifout.write(ifidx)
+            self.hosts.append(host)
             try:
                 info = open('/etc/confluent/confluent.deploycfg').read().split('\n')
             except Exception:
@@ -286,13 +269,7 @@ class HTTPSClient(client.HTTPConnection, object):
                 for line in info:
                     if line.startswith('deploy_server: ') or line.startswith('deploy_server_v6: '):
                         self.hosts.append(line.split(': ', 1)[1])
-            if plainhost and not self.hosts:
-                self.hosts.append(plainhost)
-        if self.phmac:
-            with open(phmac, 'r') as hmacin:
-                self.stdheaders['CONFLUENT_CRYPTHMAC'] = hmacin.read()
-        elif not checkonly:
-            self.stdheaders['CONFLUENT_APIKEY'] = get_apikey(node, self.hosts, errout=self.errout)
+        self.stdheaders['CONFLUENT_APIKEY'] = get_apikey(node, self.hosts, errout=self.errout)
         if mgtiface:
             self.stdheaders['CONFLUENT_MGTIFACE'] = mgtiface
         self.port = port
@@ -309,10 +286,6 @@ class HTTPSClient(client.HTTPConnection, object):
     def check_connections(self):
         foundsrv = None
         hosts = self.hosts
-        ctx = ssl.SSLContext(_protoparm)
-        ctx.load_verify_locations('/etc/confluent/ca.pem')
-        ctx.verify_mode = ssl.CERT_REQUIRED
-        ctx.check_hostname = True
         for timeo in (0.1, 5):
             for host in hosts:
                 try:
@@ -320,16 +293,10 @@ class HTTPSClient(client.HTTPConnection, object):
                     psock = socket.socket(addrinf[0])
                     psock.settimeout(timeo)
                     psock.connect(addrinf[4])
-                    chost = host.split('%', 1)[0]
-                    ctx.wrap_socket(psock, server_hostname=chost)
                     foundsrv = host
                     psock.close()
                     break
-                except (OSError, socket.error):
-                    continue
-                except ssl.SSLError:
-                    continue
-                except ssl.CertificateError:
+                except OSError:
                     continue
             else:
                 continue
@@ -357,12 +324,11 @@ class HTTPSClient(client.HTTPConnection, object):
                 raise Exception('Unable to reach any hosts')
         return foundsrv
 
-    def connect(self, tries=3):
+    def connect(self):
         addrinf = socket.getaddrinfo(self.host, self.port)[0]
         psock = socket.socket(addrinf[0])
-        psock.settimeout(15)
         psock.connect(addrinf[4])
-        ctx = ssl.SSLContext(_protoparm)
+        ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
         ctx.load_verify_locations('/etc/confluent/ca.pem')
         host = self.host.split('%', 1)[0]
         if '[' not in host and ':' in host:
@@ -380,10 +346,6 @@ class HTTPSClient(client.HTTPConnection, object):
                 self.errout.write(errmsg)
                 self.errout.flush()
             sys.exit(1)
-        except socket.timeout:
-            if not tries:
-                raise
-            return self.connect(tries=tries-1)
 
     def grab_url(self, url, data=None, returnrsp=False):
         return self.grab_url_with_status(url, data, returnrsp)[1]
@@ -444,19 +406,6 @@ if __name__ == '__main__':
         errout = sys.argv.pop(errout)
     except ValueError:
         errout = None
-    try:
-        phmac = sys.argv.index('-p')
-        sys.argv.pop(phmac)
-        phmac = sys.argv.pop(phmac)
-    except ValueError:
-        phmac = None
-    try:
-        checkonly = False
-        idxit = sys.argv.index('-c')
-        sys.argv.pop(idxit)
-        checkonly = True
-    except Exception:
-        pass
     if len(sys.argv) > 2 and os.path.exists(sys.argv[-1]):
         data = open(sys.argv[-1]).read()
     if outbin:
@@ -468,13 +417,11 @@ if __name__ == '__main__':
                 outf.write(chunk)
                 chunk = reader.read(16384)
         sys.exit(0)
-    client = HTTPSClient(usejson, errout=errout, phmac=phmac, checkonly=checkonly)
     if waitfor:
+        client = HTTPSClient(usejson, errout=errout)
         status = 201
         while status != waitfor:
             status, rsp = client.grab_url_with_status(sys.argv[1], data)
             sys.stdout.write(rsp.decode())
-    elif checkonly:
-        sys.stdout.write(client.check_connections())
     else:
-        sys.stdout.write(client.grab_url(sys.argv[1], data).decode())
+        sys.stdout.write(HTTPSClient(usejson, errout=errout).grab_url(sys.argv[1], data).decode())

confluent_osdeploy/common/profile/scripts/confignet

@@ -25,8 +25,6 @@ def add_lla(iface, mac):
     initbyte = int(pieces[0], 16) ^ 2
     lla = 'fe80::{0:x}{1}:{2}ff:fe{3}:{4}{5}/64'.format(initbyte, pieces[1], pieces[2], pieces[3], pieces[4], pieces[5])
     try:
-        with open('/proc/sys/net/ipv6/conf/{0}/disable_ipv6'.format(iface), 'w') as setin:
-            setin.write('0')
         subprocess.check_call(['ip', 'addr', 'add', 'dev', iface, lla, 'scope', 'link'])
     except Exception:
         return None
@@ -253,7 +251,6 @@ class NetworkManager(object):
 
     def apply_configuration(self, cfg):
         cmdargs = {}
-        cmdargs['connection.autoconnect'] = 'yes'
         stgs = cfg['settings']
         cmdargs['ipv6.method'] = stgs.get('ipv6_method', 'link-local')
         if stgs.get('ipv6_address', None):
@@ -297,10 +294,6 @@ class NetworkManager(object):
                 subprocess.check_call(['nmcli', 'c', 'u', u])
             else:
                 subprocess.check_call(['nmcli', 'c', 'add', 'type', self.devtypes[iname], 'con-name', cname, 'connection.interface-name', iname] + cargs)
-                self.read_connections()
-                u = self.uuidbyname.get(cname, None)
-                if u:
-                    subprocess.check_call(['nmcli', 'c', 'u', u])
 
 
 
@@ -317,10 +310,7 @@ if __name__ == '__main__':
     srvs, _ = apiclient.scan_confluents()
     doneidxs = set([])
     for srv in srvs:
-        try:
-            s = socket.create_connection((srv, 443))
-        except socket.error:
-            continue
+        s = socket.create_connection((srv, 443))
         myname = s.getsockname()
         s.close()
         if len(myname) == 4:
@@ -352,13 +342,6 @@ if __name__ == '__main__':
                     else:
                         netname_to_interfaces[uname] = {'interfaces': set([iname]), 'settings': nc['extranets'][netname]}
         doneidxs.add(curridx)
-    if 'default' in netname_to_interfaces:
-        for netn in netname_to_interfaces:
-            if netn == 'default':
-                continue
-            netname_to_interfaces['default']['interfaces'] -= netname_to_interfaces[netn]['interfaces']
-        if not netname_to_interfaces['default']['interfaces']:
-            del netname_to_interfaces['default']
     rm_tmp_llas(tmpllas)
     if os.path.exists('/usr/bin/nmcli'):
         nm = NetworkManager(devtypes)

confluent_osdeploy/common/profile/scripts/setupssh

@@ -1,31 +0,0 @@
-[ -f /lib/confluent/functions ] && . /lib/confluent/functions
-[ -f /etc/confluent/functions ] && . /etc/confluent/functions
-[ -f /opt/confluent/bin/apiclient ] && confapiclient=/opt/confluent/bin/apiclient
-[ -f /etc/confluent/apiclient ] && confapiclient=/etc/confluent/apiclient
-for pubkey in /etc/ssh/ssh_host*key.pub; do
-    certfile=${pubkey/.pub/-cert.pub}
-    rm $certfile
-    confluentpython $confapiclient /confluent-api/self/sshcert $pubkey -o $certfile
-done
-TMPDIR=$(mktemp -d)
-cd $TMPDIR
-confluentpython $confapiclient /confluent-public/site/initramfs.tgz -o initramfs.tgz
-tar xf initramfs.tgz
-for ca in ssh/*.ca; do
-	LINE=$(cat $ca)
-	cp -af /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts.new
-	grep -v "$LINE" /etc/ssh/ssh_known_hosts > /etc/ssh/ssh_known_hosts.new
-	echo '@cert-authority *' $LINE >> /etc/ssh/ssh_known_hosts.new
-	mv /etc/ssh/ssh_known_hosts.new /etc/ssh/ssh_known_hosts
-done
-for pubkey in ssh/*.*pubkey; do
-	LINE=$(cat $pubkey)
-	cp -af /root/.ssh/authorized_keys /root/.ssh/authorized_keys.new
-	grep -v "$LINE" /root/.ssh/authorized_keys > /root/.ssh/authorized_keys.new
-	echo "$LINE" >> /root/.ssh/authorized_keys.new
-	mv /root/.ssh/authorized_keys.new /root/.ssh/authorized_keys
-done
-confluentpython $confapiclient /confluent-api/self/nodelist | sed -e 's/^- //' > /etc/ssh/shosts.equiv
-cat /etc/ssh/shosts.equiv > /root/.shosts
-cd -
-rm -rf $TMPDIR

confluent_osdeploy/confluent_osdeploy-aarch64.spec.tmpl

@@ -1,91 +0,0 @@
-Name: confluent_osdeploy-aarch64
-Version: #VERSION#
-Release: 1
-Summary: OS Deployment support for confluent
-
-License: Apache2
-URL: https://hpc.lenovo.com/
-Source0: confluent_osdeploy.tar.xz
-Source1: confluent_el9bin.tar.xz
-Source2: confluent_el8bin.tar.xz
-BuildArch: noarch
-Requires: confluent_ipxe mtools tar
-BuildRoot: /tmp
-
-%description
-This contains support utilities for enabling deployment of aarch64 architecture systems
-
-
-%define debug_package %{nil}
-
-%prep
-%setup -n confluent_osdeploy -a 2 -a 1
-
-%build
-mkdir -p opt/confluent/bin
-mkdir -p stateless-bin
-cp -a el8bin/* .
-ln -s el8 el9
-for os in rhvh4 el7 genesis el8 suse15 ubuntu20.04 ubuntu22.04 coreos el9; do
-    mkdir ${os}out
-    cd ${os}out
-    if [ -d ../${os}bin ]; then 
-        cp -a ../${os}bin/opt .
-    else
-        cp -a ../opt .
-    fi
-    cp -a ../${os}/initramfs/* .
-    cp -a ../common/initramfs/* .
-    find . | cpio -H newc -o > ../addons.cpio
-    mv ../addons.cpio .
-    cd ..
-done
-for os in el7 el8 suse15 el9 ubuntu20.04; do
-    mkdir ${os}disklessout
-    cd ${os}disklessout
-    if [ -d ../${os}bin ]; then
-        cp -a ../${os}bin/opt .
-    else
-        cp -a ../opt .
-    fi
-    cp -a ../${os}-diskless/initramfs/* .
-    cp -a ../common/initramfs/* .
-    if [ -d ../${os}bin ]; then 
-        cp -a ../${os}bin/stateless-bin/* opt/confluent/bin
-    else
-        cp -a ../stateless-bin/* opt/confluent/bin
-    fi
-    find . | cpio -H newc -o > ../addons.cpio
-    mv ../addons.cpio .
-    cd ..
-done
-mkdir esxi7out
-cd esxi7out
-cp -a ../opt .
-cp -a ../esxi7/initramfs/* .
-cp -a ../common/initramfs/* .
-chmod +x bin/* opt/confluent/bin/*
-tar zcvf ../addons.tgz *
-mv ../addons.tgz .
-cd ..
-cp -a esxi7out esxi6out
-cp -a esxi7 esxi6
-cp -a esxi7out esxi8out
-cp -a esxi7 esxi8
-
-%install
-mkdir -p %{buildroot}/opt/confluent/share/licenses/confluent_osdeploy/
-#cp LICENSE %{buildroot}/opt/confluent/share/licenses/confluent_osdeploy/
-for os in rhvh4 el7 el8 el9 genesis suse15 ubuntu20.04 ubuntu22.04 esxi6 esxi7 esxi8 coreos; do
-    mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/$os/initramfs/aarch64/
-    cp ${os}out/addons.* %{buildroot}/opt/confluent/lib/osdeploy/$os/initramfs/aarch64/
-    if [ -d ${os}disklessout ]; then
-        mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/${os}-diskless/initramfs/aarch64/
-        cp ${os}disklessout/addons.* %{buildroot}/opt/confluent/lib/osdeploy/${os}-diskless/initramfs/aarch64/
-    fi
-done
-find %{buildroot}/opt/confluent/lib/osdeploy/ -name .gitignore -exec rm -f {} +
-
-%files
-/opt/confluent/lib/osdeploy
-#%license /opt/confluent/share/licenses/confluent_osdeploy/LICENSE

confluent_osdeploy/confluent_osdeploy.spec.tmpl

@@ -7,7 +7,6 @@ License: Apache2
 URL: https://hpc.lenovo.com/
 Source0: confluent_osdeploy.tar.xz
 Source1: confluent_el9bin.tar.xz
-Source2: confluent_el8bin.tar.xz
 BuildArch: noarch
 Requires: confluent_ipxe mtools tar
 BuildRoot: /tmp
@@ -19,22 +18,24 @@ This contains support utilities for enabling deployment of x86_64 architecture s
 %define debug_package %{nil}
 
 %prep
-%setup -n confluent_osdeploy -a 2 -a 1
+%setup -n confluent_osdeploy -a 1
 
 %build
-#cd utils
-#make all
-#cp confluent_imginfo copernicus clortho autocons ../opt/confluent/bin
-#cp start_root urlmount ../stateless-bin/
-#cd ..
+mkdir -p opt/confluent/bin
+mkdir -p stateless-bin
+cd utils
+make all
+cp confluent_imginfo copernicus clortho autocons ../opt/confluent/bin
+cp start_root urlmount ../stateless-bin/
+cd ..
 ln -s el8 el9
-for os in rhvh4 el7 genesis el8 suse15 ubuntu18.04 ubuntu20.04 ubuntu22.04 coreos el9; do
+for os in rhvh4 el7 genesis el8 suse15 ubuntu20.04 ubuntu22.04 coreos el9; do
     mkdir ${os}out
     cd ${os}out
     if [ -d ../${os}bin ]; then 
         cp -a ../${os}bin/opt .
     else
-        cp -a ../el8bin/opt .
+        cp -a ../opt .
     fi
     cp -a ../${os}/initramfs/* .
     cp -a ../common/initramfs/* .
@@ -48,14 +49,14 @@ for os in el7 el8 suse15 el9 ubuntu20.04; do
     if [ -d ../${os}bin ]; then
         cp -a ../${os}bin/opt .
     else
-        cp -a ../el8bin/opt .
+        cp -a ../opt .
     fi
     cp -a ../${os}-diskless/initramfs/* .
     cp -a ../common/initramfs/* .
     if [ -d ../${os}bin ]; then 
         cp -a ../${os}bin/stateless-bin/* opt/confluent/bin
     else
-        cp -a ../el8bin/stateless-bin/* opt/confluent/bin
+        cp -a ../stateless-bin/* opt/confluent/bin
     fi
     find . | cpio -H newc -o > ../addons.cpio
     mv ../addons.cpio .
@@ -63,7 +64,7 @@ for os in el7 el8 suse15 el9 ubuntu20.04; do
 done
 mkdir esxi7out
 cd esxi7out
-cp -a ../el8bin/opt .
+cp -a ../opt .
 cp -a ../esxi7/initramfs/* .
 cp -a ../common/initramfs/* .
 chmod +x bin/* opt/confluent/bin/*
@@ -72,13 +73,11 @@ mv ../addons.tgz .
 cd ..
 cp -a esxi7out esxi6out
 cp -a esxi7 esxi6
-cp -a esxi7out esxi8out
-cp -a esxi7 esxi8
 
 %install
 mkdir -p %{buildroot}/opt/confluent/share/licenses/confluent_osdeploy/
 cp LICENSE %{buildroot}/opt/confluent/share/licenses/confluent_osdeploy/
-for os in rhvh4 el7 el8 el9 genesis suse15 ubuntu20.04 ubuntu18.04 ubuntu22.04 esxi6 esxi7 esxi8 coreos; do
+for os in rhvh4 el7 el8 el9 genesis suse15 ubuntu20.04 ubuntu22.04 esxi6 esxi7 coreos; do
     mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/$os/initramfs
     mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/$os/profiles
     cp ${os}out/addons.* %{buildroot}/opt/confluent/lib/osdeploy/$os/initramfs

confluent_osdeploy/coreos/initramfs/opt/confluent/bin/initconfluent.sh

@@ -20,7 +20,6 @@ if [ -e /dev/disk/by-label/CNFLNT_IDNT ]; then
     else
         v4addr=$(grep ^ipv4_address: $tcfg)
         v4addr=${v4addr#ipv4_address: }
-        v4addr=${v4addr%/*}
         v4gw=$(grep ^ipv4_gateway: $tcfg)
         v4gw=${v4gw#ipv4_gateway: }
         if [ "$v4gw" = "null" ]; then

confluent_osdeploy/debian/initramfs/lib/debian-installer-startup.d/S25confluentinit

@@ -1,97 +0,0 @@
-reverse_uuid() {
-    echo $1 | head -c 8 | tail -c 2
-    echo $1 | head -c 6 | tail -c 2
-    echo $1 | head -c 4 | tail -c 2
-    echo $1 | head -c 2 | tail -c 2
-    echo $1 | head -c 13 | tail -c 2
-    echo $1 | head -c 11 | tail -c 2
-    echo $1 | head -c 18 | tail -c 2
-    echo $1 | head -c 16 | tail -c 2
-    echo $1 | tail -c 18 | sed -e s/-//
-}
-setdebopt() {
-    debconf-set $1 $2
-    echo d-i $1 $3 $2 >> /preseed.cfg
-}
-
-dhuuid=$(reverse_uuid $(cat /sys/devices/virtual/dmi/id/product_uuid))
-dhcpid=$(mktemp)
-mkdir -p /etc/confluent
-cp /tls/* /etc/ssl/certs/
-for nic in $(ip link | grep mtu|grep -v LOOPBACK|cut -d: -f 2|sed -e 's/ //'); do
-     ip link set $nic up
-done
-for nic in $(ip link | grep mtu|grep -v LOOPBACK|grep LOWER_UP|cut -d: -f 2|sed -e 's/ //'); do
-    if udhcpc -i $nic -p $dhcpid -t 2 -T 2 -n -x 93:0007 -x 97:00$dhuuid -q; then
-         /opt/confluent/bin/copernicus > /etc/confluent/confluent.info
-         if grep ^MANAGER:.*\\. /etc/confluent/confluent.info ; then
-             break
-         fi
-    fi
-    ip -4 flush dev $nic
-done    
-mgr=$(grep ^MANAGER:.*\\. /etc/confluent/confluent.info|head -n 1|cut -d: -f 2|sed -e 's/ //')
-nodename=$(grep ^NODENAME: /etc/confluent/confluent.info|head -n 1|cut -d: -f 2|sed -e 's/ //')
-/opt/confluent/bin/clortho $nodename $mgr > /etc/confluent/confluent.apikey
-apikey=$(cat /etc/confluent/confluent.apikey)
-cd /etc/confluent
-wget --header="CONFLUENT_NODENAME: $nodename" --header="CONFLUENT_APIKEY: $apikey" https://$mgr/confluent-api/self/deploycfg
-cd -
-predir=$(mktemp -d)
-cd $predir
-profile=$(grep ^profile: /etc/confluent/deploycfg|cut -d ' ' -f 2)
-wget https://$mgr/confluent-public/os/$profile/scripts/pre.sh
-chmod u+x pre.sh
-wget https://$mgr/confluent-public/os/$profile/preseed.cfg
-mv preseed.cfg /
-setdebopt auto-install/enable true boolean
-setdebopt partman/early_command  $predir/pre.sh string
-cd -
-ip -4 a flush dev $nic
-setdebopt netcfg/choose_interface $nic select
-setdebopt netcfg/get_hostname $nodename string
-v4cfgmeth=$(grep ipv4_method: /etc/confluent/deploycfg |cut -d: -f 2|sed -e 's/ //')
-if [ "$v4cfgmeth" = "static" ]; then
-    setdebopt netcfg/disable_dhcp true boolean
-    v4addr=$(grep ^ipv4_address: /etc/confluent/deploycfg|cut -d: -f 2|sed -e 's/ //')
-    v4gw=$(grep ^ipv4_gateway: /etc/confluent/deploycfg|cut -d: -f 2| sed -e 's/ //')
-    if [ "$v4gw" = "null" ]; then
-        v4gw=""
-    fi
-    v4nm=$(grep ^ipv4_netmask: /etc/confluent/deploycfg|cut -d: -f 2|sed -e 's/ //')
-    setdebopt netcfg/get_netmask $v4nm string
-    setdebopt netcfg/get_ipaddress $v4addr string
-    setdebopt netcfg/confirm_static true boolean
-    if [ ! -z "$v4gw" ]; then
-        setdebopt netcfg/get_gateway $v4gw string
-    fi
-    namesrvs=$(sed -n '/^nameservers:/,/^[^-]/p' /etc/confluent/deploycfg|grep ^- | cut -d ' ' -f 2|sed -e 's/ //')
-    for namesrv in "$namesrvs"; do
-        setdebopt netcfg/get_nameservers $namesrv string
-    done
-elif [ "$v4cfgmeth" = "dhcp" ]; then
-    setdebopt netcfg/disable_dhcp false boolean
-    setdebopt netcfg/confirm_static false boolean
-fi
-rootpass=$(grep ^rootpassword: /etc/confluent/deploycfg|cut -d ' ' -f 2|sed -e 's/ //')
-if [ "$rootpass" = null ] || [ -z "$rootpass" ]; then
-    setdebopt passwd/root-login false boolean
-else
-    setdebopt passwd/root-login true boolean
-    setdebopt passwd/root-password-crypted $rootpass string
-fi
-setdebopt time/zone $(grep ^timezone: /etc/confluent/deploycfg|cut -d ' ' -f 2|sed -e 's/ //') string
-ntpsrvs=$(sed -n '/^ntpservers:/,/^[^-]/p' /etc/confluent/deploycfg|grep ^- | cut -d ' ' -f 2|sed -e 's/ //')
-for ntpsrv in "$ntpsrvs"; do
-    setdebopt clock-setup/ntp true boolean
-    setdebopt clock-setup/ntep-server $ntpsrv string
-done
-#setdebopt console-setup/layoutcode $(grep ^keymap: /etc/confluent/deploycfg|cut -d ' ' -f 2) string
-setdebopt debian-installer/locale $(grep ^locale: /etc/confluent/deploycfg|cut -d ' ' -f 2) select
-domainname=$(grep ^dnsdomain: /etc/confluent/deploycfg|cut -d ' ' -f 2)
-if [ ! -z "$domainname" ] && [ "$domainname" != "null" ]; then
-    setdebopt netcfg/get_domain $domainname string
-fi
-
-
-

confluent_osdeploy/debian/profiles/default/scripts/pre.sh

@@ -1,18 +0,0 @@
-anna-install openssh-server-udeb
-mkdir -p ~/.ssh/
-cat /ssh/*pubkey > ~/.ssh/authorized_keys
-ssh-keygen -A
-mgr=$(grep ^MANAGER:.*\\. /etc/confluent/confluent.info|head -n 1|cut -d: -f 2|sed -e 's/ //')
-nodename=$(grep ^NODENAME: /etc/confluent/confluent.info|head -n 1|cut -d: -f 2|sed -e 's/ //')
-apikey=$(cat /etc/confluent/confluent.apikey)
-for pubkey in /etc/ssh/ssh_host*key.pub; do
-    certfile=${pubkey%.pub}-cert.pub
-    keyfile=${pubkey%.pub}
-    wget --post-file=$pubkey --header='CONFLUENT_NODENAME: '$nodename --header="CONFLUENT_APIKEY: $apikey" https://$mgr/confluent-api/self/sshcert -O $certfile
-    echo HostKey $keyfile >> /etc/ssh/sshd_config
-    echo HostCertificate $certfile >> /etc/ssh/sshd_config
-done
-
-echo sshd:x:939:939::/: >> /etc/passwd
-/usr/sbin/sshd
-

confluent_osdeploy/el7-diskless/profiles/default/scripts/firstboot.sh

@@ -5,18 +5,17 @@
 # noted below so custom commands are executed before
 # the script notifies confluent that install is fully complete.
 
-HOME=$(getent passwd $(whoami)|cut -d: -f 6)
-export HOME
 nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
 confluent_apikey=$(cat /etc/confluent/confluent.apikey)
 confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 export nodename confluent_mgr confluent_profile
 . /etc/confluent/functions
-(
 exec >> /var/log/confluent/confluent-firstboot.log
 exec 2>> /var/log/confluent/confluent-firstboot.log
 chmod 600 /var/log/confluent/confluent-firstboot.log
+tail -f /var/log/confluent/confluent-firstboot.log > /dev/console &
+logshowpid=$!
 while ! ping -c 1 $confluent_mgr >& /dev/null; do
 	sleep 1
 done
@@ -38,5 +37,4 @@ curl -X POST -d 'status: complete' -H "CONFLUENT_NODENAME: $nodename" -H "CONFLU
 systemctl disable firstboot
 rm /etc/systemd/system/firstboot.service
 rm /etc/confluent/firstboot.ran
-) &
-tail --pid  $! -F /var/log/confluent/confluent-firstboot.log > /dev/console
+kill $logshowpid

confluent_osdeploy/el7-diskless/profiles/default/scripts/functions

@@ -1,10 +1,6 @@
 #!/bin/bash
 function test_mgr() {
-    whost=$1
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    if curl -gs https://${whost}/confluent-api/ > /dev/null; then
+    if curl -s https://${1}/confluent-api/ > /dev/null; then
         return 0
     fi
     return 1
@@ -62,11 +58,7 @@ fetch_remote() {
     fi
     set_confluent_vars
     mkdir -p $(dirname $1)
-    whost=$confluent_mgr
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    curl -gf -sS $curlargs https://$whost/confluent-public/os/$confluent_profile/scripts/$1 > $1
+    curl -f -sS $curlargs https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/$1 > $1
     if [ $? != 0 ]; then echo $1 failed to download; return 1; fi
 }
 
@@ -173,11 +165,7 @@ run_remote_python() {
     echo Executing in $confluentscripttmpdir
     cd $confluentscripttmpdir
     mkdir -p $(dirname $1)
-    whost=$confluent_mgr
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    curl -gf -sS $curlargs https://$whost/confluent-public/os/$confluent_profile/scripts/$1 > $1
+    curl -f -sS $curlargs https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/$1 > $1
     if [ $? != 0 ]; then echo "'$*'" failed to download; return 1; fi
     confluentpython $*
     retcode=$?

confluent_osdeploy/el7-diskless/profiles/default/scripts/getinstalldisk

@@ -54,7 +54,7 @@ class DiskInfo(object):
 
     @property
     def priority(self):
-        if self.model.lower() in ('m.2 nvme 2-bay raid kit', 'thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
+        if self.model.lower() in ('thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
             return 0
         if 'imsm' in self.mdcontainer:
             return 1

confluent_osdeploy/el7-diskless/profiles/default/scripts/imageboot.sh

@@ -15,7 +15,7 @@ export mountsrc=$loopdev
 losetup -r $loopdev /mnt/remoteimg/rootimg.sfs
 if grep '^Format: confluent_crypted' /tmp/rootimg.info > /dev/null; then
     while ! curl -sf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" https://$confluent_mgr/confluent-api/self/profileprivate/pending/rootimg.key > /tmp/rootimg.key; do
-        echo "Unable to retrieve private key from $confluent_mgr (verify that confluent can access /var/lib/confluent/private/os/$confluent_profile/pending/rootimg.key)"
+        echo "Unable to retrieve private key from $confluent_mgr (verify that confluent can access /var/lib/confluent/private/$confluent_profile/pending/rootimg.key)"
         sleep 1
     done
     cipher=$(head -n 1 /tmp/rootimg.key)
@@ -125,6 +125,4 @@ if grep installtodisk /proc/cmdline > /dev/null; then
 fi
 mv /lib/modules/$(uname -r) /lib/modules/$(uname -r)-ramfs
 ln -s /sysroot/lib/modules/$(uname -r) /lib/modules/
-mv /lib/firmware /lib/firmware-ramfs
-ln -s /sysroot/lib/firmware /lib/firmware
 exec /opt/confluent/bin/start_root

confluent_osdeploy/el7-diskless/profiles/default/scripts/onboot.sh

@@ -9,7 +9,6 @@ nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
 confluent_apikey=$(cat /etc/confluent/confluent.apikey)
 confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-timedatectl set-timezone $(grep ^timezone: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 export nodename confluent_mgr confluent_profile
 . /etc/confluent/functions
 mkdir -p /var/log/confluent

confluent_osdeploy/el7/initramfs/usr/lib/dracut/hooks/initqueue/01-confluent.sh

@@ -7,127 +7,41 @@ if [ -f /tmp/dd_disk ]; then
         fi
     done
 fi
-shutdownnic=""
-oum=$(umask)
-umask 0077
 mkdir -p /etc/confluent
-echo -n > /etc/confluent/confluent.info
 cat /tls/*.pem > /etc/confluent/ca.pem
-TRIES=5
-while [ ! -e /dev/disk ] && [ $TRIES -gt 0 ]; do
-    sleep 2
-    TRIES=$((TRIES - 1))
-done
-if [ -e /dev/disk/by-label/CNFLNT_IDNT ]; then
-    tmnt=/tmp/idntmnt
-    mkdir -p $tmnt
-    tcfg=/tmp/idnttmp
-    mount /dev/disk/by-label/CNFLNT_IDNT $tmnt
-    cd $tmnt
-    deploysrvs=$(sed -n '/^deploy_servers:/, /^[^-]/p' cnflnt.yml |grep ^-|sed -e 's/^- //'|grep -v :)
-
-    nodename=$(grep ^nodename: cnflnt.yml|awk '{print $2}')
-    ln -s /opt/confluent/bin/clortho /opt/confluent/bin/genpasshmac
-    hmackeyfile=/tmp/hmackeyfile
-    passfile=/etc/confluent/confluent.apikey
-    passcrypt=/tmp/passcrypt
-    hmacfile=/tmp/hmacfile
-    echo -n $(grep ^apitoken: cnflnt.yml|awk '{print $2}') > $hmackeyfile;
-    /opt/confluent/bin/genpasshmac $passfile $passcrypt $hmacfile $hmackeyfile
-    echo "NODENAME: "$nodename > /etc/confluent/confluent.info
-    for dsrv in $deploysrvs; do
-        echo 'MANAGER: '$dsrv >> /etc/confluent/confluent.info
-    done
-    sed -n '/^net_cfgs:/, /^[^- ]/{/^[^- ]/!p}' cnflnt.yml |sed -n '/^-/, /^-/{/^-/!p}'| sed -e 's/^[- ]*//'> $tcfg
-    autoconfigmethod=$(grep ^ipv4_method: $tcfg)
-    autoconfigmethod=${autoconfigmethod#ipv4_method: }
-     for i in /sys/class/net/*; do
-        ip link set $(basename $i) down
-        udevadm info $i | grep ID_NET_DRIVER=cdc_ether > /dev/null &&  continue
-        ip link set $(basename $i) up
-    done
-    sleep 10
-    usedhcp=0
-    for NICGUESS in $(ip link|grep LOWER_UP|grep -v LOOPBACK| awk '{print $2}' | sed -e 's/:$//'); do
-        if [ "$autoconfigmethod" = "dhcp" ]; then
-            usedhcp=1
-        else
-            v4addr=$(grep ^ipv4_address: $tcfg)
-            v4addr=${v4addr#ipv4_address: }
-            v4plen=${v4addr#*/}
-            v4addr=${v4addr%/*}
-            v4gw=$(grep ^ipv4_gateway: $tcfg)
-            v4gw=${v4gw#ipv4_gateway: }
-            ip addr add dev $NICGUESS $v4addr/$v4plen
-            if [ "$v4gw" = "null" ]; then
-                v4gw=""
-            fi
-            if [ ! -z "$v4gw" ]; then
-                ip route add default via $v4gw
-            fi
-            v4nm=$(grep ipv4_netmask: $tcfg)
-            v4nm=${v4nm#ipv4_netmask: }
-            TESTSRV=$(python /opt/confluent/bin/apiclient -c 2> /dev/null)
-            if [ ! -z "$TESTSRV" ]; then
-                python /opt/confluent/bin/apiclient -p $hmacfile /confluent-api/self/registerapikey $passcrypt
-                mgr=$TESTSRV
-                ifname=$NICGUESS
-                shutdownnic=$ifname
-                break
-            fi
-            if [ ! -z "$v4gw" ]; then
-                ip route del default via $v4gw
-            fi
-            ip -4 addr flush dev $NICGUESS
-        fi
-    done
-fi
 TRIES=0
-if [ "$usedhcp" = 1 ]; then
-    echo ip=$ifname:dhcp >>  /etc/cmdline.d/01-confluent.conf
-elif [ -z "$ifname" ]; then
-    cd /sys/class/net
-    while ! awk -F'|' '{print $3}' /etc/confluent/confluent.info |grep 1 >& /dev/null && [ "$TRIES" -lt 60 ]; do
-        TRIES=$((TRIES + 1))
-        for currif in *; do
-            ip link set $currif up
-        done
-        /opt/confluent/bin/copernicus -t > /etc/confluent/confluent.info
+echo -n > /etc/confluent/confluent.info
+cd /sys/class/net
+while ! awk -F'|' '{print $3}' /etc/confluent/confluent.info |grep 1 >& /dev/null && [ "$TRIES" -lt 60 ]; do
+    TRIES=$((TRIES + 1))
+    for currif in *; do
+        ip link set $currif up
     done
-    cd /
-    grep ^EXTMGRINFO: /etc/confluent/confluent.info || return 0  # Do absolutely nothing if no data at all yet
-    echo -n "" > /etc/cmdline.d/01-confluent.conf
-else
-    echo ip=$v4addr::$v4gw:$v4nm:$hostname:$ifname:none > /etc/cmdline.d/01-confluent.conf
-fi
-python /opt/confluent/bin/apiclient /confluent-api/self/deploycfg > /etc/confluent/confluent.deploycfg
-if [ ! -z "$shutdownnic" ]; then
-    if [ ! -z "$v4gw" ]; then
-        ip route del default via $v4gw
-    fi
-    ip -4 addr flush dev $shutdownnic
-fi
-# restart cmdline
-nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
+    /opt/confluent/bin/copernicus -t > /etc/confluent/confluent.info
+done
+cd /
+grep ^EXTMGRINFO: /etc/confluent/confluent.info || return 0  # Do absolutely nothing if no data at all yet
 echo -n "" > /tmp/confluent.initq
-if [ -z "$ifname"  ]; then
-    ifidx=$(cat /tmp/confluent.ifidx)
-    ifname=$(ip link |grep ^$ifidx:|awk '{print $2}')
-    ifname=${ifname%:}
-fi
-if [ ! -z "$ifname" ]; then
-    echo $ifname > /tmp/net.ifaces
-fi
+# restart cmdline
+echo -n "" > /etc/cmdline.d/01-confluent.conf
+nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
+#TODO: blkid --label <whatever> to find mounted api
+
+oum=$(umask)
+python /opt/confluent/bin/apiclient /confluent-api/self/deploycfg > /etc/confluent/confluent.deploycfg
+ifidx=$(cat /tmp/confluent.ifidx)
+ifname=$(ip link |grep ^$ifidx:|awk '{print $2}')
+ifname=${ifname%:}
+echo $ifname > /tmp/net.ifaces
+
 dnsdomain=$(grep ^dnsdomain: /etc/confluent/confluent.deploycfg)
 dnsdomain=${dnsdomain#dnsdomain: }
 hostname=$nodename
 if [ ! -z "$dnsdomain" ] && [ "$dnsdomain" != "null" ]; then
     hostname=$hostname.$dnsdomain
 fi
-if [ -z "$mgr" ]; then
-    mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
-    mgr=${mgr#deploy_server: }
-fi
+mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
+mgr=${mgr#deploy_server: }
 profilename=$(grep ^profile: /etc/confluent/confluent.deploycfg)
 profilename=${profilename#profile: }
 proto=$(grep ^protocol: /etc/confluent/confluent.deploycfg)
@@ -151,23 +65,21 @@ kickstart=$proto://$mgr/confluent-public/os/$profilename/kickstart
 root=anaconda-net:$proto://$mgr/confluent-public/os/$profilename/distribution
 export kickstart
 export root
-if [ -z "$autoconfigmethod" ]; then
-    autoconfigmethod=$(grep ipv4_method /etc/confluent/confluent.deploycfg)
-    autoconfigmethod=${autoconfigmethod#ipv4_method: }
-    if [ "$autoconfigmethod" = "dhcp" ]; then
-        echo ip=$ifname:dhcp >>  /etc/cmdline.d/01-confluent.conf
-    else
-        v4addr=$(grep ^ipv4_address: /etc/confluent/confluent.deploycfg)
-        v4addr=${v4addr#ipv4_address: }
-        v4gw=$(grep ^ipv4_gateway: /etc/confluent/confluent.deploycfg)
-        v4gw=${v4gw#ipv4_gateway: }
-        if [ "$v4gw" = "null" ]; then
-            v4gw=""
-        fi
-        v4nm=$(grep ipv4_netmask: /etc/confluent/confluent.deploycfg)
-        v4nm=${v4nm#ipv4_netmask: }
-        echo ip=$v4addr::$v4gw:$v4nm:$hostname:$ifname:none >> /etc/cmdline.d/01-confluent.conf
+autoconfigmethod=$(grep ipv4_method /etc/confluent/confluent.deploycfg)
+autoconfigmethod=${autoconfigmethod#ipv4_method: }
+if [ "$autoconfigmethod" = "dhcp" ]; then
+    echo ip=$ifname:dhcp >>  /etc/cmdline.d/01-confluent.conf
+else
+    v4addr=$(grep ^ipv4_address: /etc/confluent/confluent.deploycfg)
+    v4addr=${v4addr#ipv4_address: }
+    v4gw=$(grep ^ipv4_gateway: /etc/confluent/confluent.deploycfg)
+    v4gw=${v4gw#ipv4_gateway: }
+    if [ "$v4gw" = "null" ]; then
+        v4gw=""
     fi
+    v4nm=$(grep ipv4_netmask: /etc/confluent/confluent.deploycfg)
+    v4nm=${v4nm#ipv4_netmask: }
+    echo ip=$v4addr::$v4gw:$v4nm:$hostname:$ifname:none >> /etc/cmdline.d/01-confluent.conf
 fi
 nameserversec=0
 while read -r entry; do

confluent_osdeploy/el7/profiles/default/ansible/firstboot.d/README.txt

@@ -1,10 +1,6 @@
 Ansible playbooks ending in .yml or .yaml that are placed into this directory will be executed at the
 appropriate phase of the install process.
 
-Alternatively, plays may be placed in /var/lib/confluent/private/os/<profilename>/ansible/<directory>.
-This prevents public clients from being able to read the plays, which is not necessary for them to function,
-and may protect them from divulging material contained in the plays or associated roles.
-
 The 'hosts' may be omitted, and if included will be ignored, replaced with the host that is specifically
 requesting the playbooks be executed.
 

confluent_osdeploy/el7/profiles/default/ansible/post.d/README.txt

@@ -1,10 +1,6 @@
 Ansible playbooks ending in .yml or .yaml that are placed into this directory will be executed at the
 appropriate phase of the install process.
 
-Alternatively, plays may be placed in /var/lib/confluent/private/os/<profilename>/ansible/<directory>.
-This prevents public clients from being able to read the plays, which is not necessary for them to function,
-and may protect them from divulging material contained in the plays or associated roles.
-
 The 'hosts' may be omitted, and if included will be ignored, replaced with the host that is specifically
 requesting the playbooks be executed.
 

confluent_osdeploy/el7/profiles/default/scripts/firstboot.sh

@@ -1,6 +1,4 @@
 #!/bin/sh
-HOME=$(getent passwd $(whoami)|cut -d: -f 6)
-export HOME
 
 # This script is executed on the first boot after install has
 # completed. It is best to edit the middle of the file as

confluent_osdeploy/el7/profiles/default/scripts/functions

@@ -1,10 +1,6 @@
 #!/bin/bash
 function test_mgr() {
-    whost=$1
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    if curl -gs https://${whost}/confluent-api/ > /dev/null; then
+    if curl -s https://${1}/confluent-api/ > /dev/null; then
         return 0
     fi
     return 1
@@ -62,11 +58,7 @@ fetch_remote() {
     fi
     set_confluent_vars
     mkdir -p $(dirname $1)
-    whost=$confluent_mgr
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    curl -gf -sS $curlargs https://$whost/confluent-public/os/$confluent_profile/scripts/$1 > $1
+    curl -f -sS $curlargs https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/$1 > $1
     if [ $? != 0 ]; then echo $1 failed to download; return 1; fi
 }
 
@@ -173,11 +165,7 @@ run_remote_python() {
     echo Executing in $confluentscripttmpdir
     cd $confluentscripttmpdir
     mkdir -p $(dirname $1)
-    whost=$confluent_mgr
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    curl -gf -sS $curlargs https://$whost/confluent-public/os/$confluent_profile/scripts/$1 > $1
+    curl -f -sS $curlargs https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/$1 > $1
     if [ $? != 0 ]; then echo "'$*'" failed to download; return 1; fi
     confluentpython $*
     retcode=$?

confluent_osdeploy/el7/profiles/default/scripts/getinstalldisk

@@ -46,15 +46,10 @@ class DiskInfo(object):
                 self.driver = v.replace('"', '')
         if not self.driver and 'imsm' not in self.mdcontainer:
             raise Exception("No driver detected")
-        if os.path.exists('/sys/block/{0}/size'.format(self.name)):
-            with open('/sys/block/{0}/size'.format(self.name), 'r') as sizesrc:
-                self.size = int(sizesrc.read()) * 512
-        if int(self.size) < 536870912:
-            raise Exception("Device too small for install")
 
     @property
     def priority(self):
-        if self.model.lower() in ('m.2 nvme 2-bay raid kit', 'thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
+        if self.model.lower() in ('thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
             return 0
         if 'imsm' in self.mdcontainer:
             return 1

confluent_osdeploy/el7/profiles/default/scripts/syncfileclient

@@ -3,9 +3,9 @@ import importlib
 import tempfile
 import json
 import os
-import shutil
 import pwd
 import grp
+import shutil
 try:
     from importlib.machinery import SourceFileLoader
     def load_source(mod, path):
@@ -19,7 +19,6 @@ except IOError:
     apiclient = load_source('apiclient', '/etc/confluent/apiclient')
 
 
-
 def partitionhostsline(line):
     comment = ''
     try:
@@ -272,7 +271,6 @@ def synchronize():
                         os.chown(fname, uid, gid)
     finally:
         shutil.rmtree(tmpdir)
-        shutil.rmtree(appendoncedir)
 
 
 if __name__ == '__main__':

confluent_osdeploy/el8-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh

@@ -25,7 +25,6 @@ get_remote_apikey() {
         fi
     done
 }
-. /lib/dracut-lib.sh
 root=1
 rootok=1
 netroot=confluent
@@ -95,41 +94,6 @@ cd - > /dev/null
 rm -rf $tpmdir
 touch /etc/confluent/confluent.info
 cd /sys/class/net
-touch /etc/confluent/confluent.info
-confluentsrv=$(getarg confluent)
-DIDDHCP=0
-if [ ! -z "$confluentsrv" ]; then
-    for i in *; do
-        ip link set $i up
-    done
-    if [[ "$confluentsrv" = *":"* ]]; then
-        confluenthttpsrv=[$confluentsrv]
-        /usr/libexec/nm-initrd-generator ip=:dhcp6
-    else
-        confluenthttpsrv=$confluentsrv
-        ifname=$(ip -br link|grep LOWER_UP|grep -v UNKNOWN|head -n 1|awk '{print $1}')
-        echo -n "Attempting to use dhcp to bring up $ifname..."
-        dhclient $ifname
-        while ! ip -br addr show dev $ifname | grep \\. > /dev/null; do
-            echo -n "Still waiting for IPv4 address on: "
-            ip -br link show dev $ifname 
-            sleep 1
-        done
-        echo -n "Complete: "
-        ip -br addr show dev $ifname
-        DIDDHCP=1
-    fi
-    myids=uuid=$(cat /sys/devices/virtual/dmi/id/product_uuid)
-    for mac in $(ip -br link|grep -v LOOPBACK|awk '{print $3}'); do
-        myids=$myids"/mac="$mac
-    done
-    myname=$(curl -sH "CONFLUENT_IDS: $myids" https://$confluenthttpsrv/confluent-api/self/whoami)
-    if [ ! -z "$myname" ]; then
-        echo NODENAME: $myname > /etc/confluent/confluent.info
-        echo MANAGER: $confluentsrv >> /etc/confluent/confluent.info
-        echo EXTMGRINFO: $confluentsrv'||1' >> /etc/confluent/confluent.info
-    fi
-fi
 echo -n "Scanning for network configuration..."
 while ! grep ^EXTMGRINFO: /etc/confluent/confluent.info | awk -F'|' '{print $3}' | grep 1 >& /dev/null && [ "$TRIES" -lt 30 ]; do
     TRIES=$((TRIES + 1))
@@ -159,7 +123,7 @@ while [ $ready = "0" ]; do
         confluent_mgr="[$confluent_mgr]"
     fi
     tmperr=$(mktemp)
-    curl -sSf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" https://$confluent_mgr/confluent-api/self/deploycfg2 > /etc/confluent/confluent.deploycfg 2> $tmperr
+    curl -sSf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" https://$confluent_mgr/confluent-api/self/deploycfg > /etc/confluent/confluent.deploycfg 2> $tmperr
     if grep 401 $tmperr > /dev/null; then
         confluent_apikey=""
         if [ -n "$lasthdl" ]; then
@@ -183,43 +147,13 @@ if [ -c /dev/tpmrm0 ]; then
     tpm2_pcrextend 15:sha256=2fbe96c50dde38ce9cd2764ddb79c216cfbcd3499568b1125450e60c45dd19f2
 fi
 umask $oldumask
-mkdir -p /run/NetworkManager/system-connections
-cat > /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-[connection]
-EOC
-echo id=${ifname} >> /run/NetworkManager/system-connections/$ifname.nmconnection
-echo uuid=$(uuidgen) >> /run/NetworkManager/system-connections/$ifname.nmconnection
-cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-type=ethernet
-autoconnect-retries=1
-EOC
-echo interface-name=$ifname >> /run/NetworkManager/system-connections/$ifname.nmconnection
-cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-multi-connect=1
-permissions=
-wait-device-timeout=60000
-
-[ethernet]
-mac-address-blacklist=
-
-EOC
 autoconfigmethod=$(grep ^ipv4_method: /etc/confluent/confluent.deploycfg |awk '{print $2}')
-auto6configmethod=$(grep ^ipv6_method: /etc/confluent/confluent.deploycfg |awk '{print $2}')
 if [ "$autoconfigmethod" = "dhcp" ]; then
-    if [ "$DIDDHCP" = "0" ]; then
-        echo -n "Attempting to use dhcp to bring up $ifname..."
-        dhclient $ifname
-        while ! ip -br addr show dev $ifname | grep \\. > /dev/null; do
-            echo -n "Still waiting for IPv4 address on: "
-            ip -br link show dev $ifname 
-            sleep 1
-        done
-        echo -n "Complete: "
-        ip -br addr show dev $ifname
-    fi
-    confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg| awk '{print $2}')
-elif [ "$autoconfigmethod" = "static" ]; then
-    confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg| awk '{print $2}')
+    echo -n "Attempting to use dhcp to bring up $ifname..."
+    dhclient $ifname
+    echo "Complete:"
+    ip addr show dev $ifname
+else
     v4addr=$(grep ^ipv4_address: /etc/confluent/confluent.deploycfg)
     v4addr=${v4addr#ipv4_address: }
     v4gw=$(grep ^ipv4_gateway: /etc/confluent/confluent.deploycfg)
@@ -233,8 +167,28 @@ elif [ "$autoconfigmethod" = "static" ]; then
     ip addr add dev $ifname $v4addr/$v4nm
     if [ ! -z "$v4gw" ]; then
         ip route add default via $v4gw
-    fi    
-    echo '[ipv4]' >> /run/NetworkManager/system-connections/$ifname.nmconnection
+    fi
+    mkdir -p /run/NetworkManager/system-connections
+    cat > /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
+[connection]
+EOC
+    echo id=${ifname} >> /run/NetworkManager/system-connections/$ifname.nmconnection
+    echo uuid=$(uuidgen) >> /run/NetworkManager/system-connections/$ifname.nmconnection
+    cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
+type=ethernet
+autoconnect-retries=1
+EOC
+    echo interface-name=$ifname >> /run/NetworkManager/system-connections/$ifname.nmconnection
+    cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
+multi-connect=1
+permissions=
+wait-device-timeout=60000
+
+[ethernet]
+mac-address-blacklist=
+
+[ipv4]
+EOC
     echo address1=$v4addr/$v4nm >> /run/NetworkManager/system-connections/$ifname.nmconnection
     if [ ! -z "$v4gw" ]; then
         echo gateway=$v4gw >> /run/NetworkManager/system-connections/$ifname.nmconnection
@@ -243,7 +197,7 @@ elif [ "$autoconfigmethod" = "static" ]; then
     nameservers=""
     while read -r entry; do
         if [ $nameserversec = 1 ]; then
-            if [[ $entry == "-"*.* ]]; then
+            if [[ $entry == "-"* ]]; then
                 nameservers="$nameservers"${entry#- }";"
                 continue
             fi
@@ -266,69 +220,16 @@ method=manual
 addr-gen-mode=eui64
 method=auto
 
+[proxy]
 EOC
-elif [ "$auto6configmethod" = "static" ]; then
-    confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg| awk '{print $2}')
-    v6addr=$(grep ^ipv6_address: /etc/confluent/confluent.deploycfg)
-    v6addr=${v6addr#ipv6_address: }
-    v6gw=$(grep ^ipv6_gateway: /etc/confluent/confluent.deploycfg)
-    v6gw=${v6gw#ipv6_gateway: }
-    if [ "$v6gw" = "null" ]; then
-        v6gw=""
-    fi
-    v6nm=$(grep ^ipv6_prefix: /etc/confluent/confluent.deploycfg)
-    v6nm=${v6nm#ipv6_prefix: }
-    echo "Setting up $ifname as static at $v6addr/$v6nm"
-    ip addr add dev $ifname $v6addr/$v6nm
-    
-    cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-[ipv4]
-dhcp-timeout=90
-dhcp-vendor-class-identifier=anaconda-Linux
-method=disabled
-
-[ipv6]
-addr-gen-mode=eui64
-method=manual
-may-fail=false
-EOC
-    echo address1=$v6addr/$v6nm >> /run/NetworkManager/system-connections/$ifname.nmconnection
-    if [ ! -z "$v6gw" ]; then
-        ip route add default via $v6gw
-        echo gateway=$v6gw >> /run/NetworkManager/system-connections/$ifname.nmconnection
-    fi
-    nameserversec=0
-    nameservers=""
-    while read -r entry; do
-        if [ $nameserversec = 1 ]; then
-            if [[ $entry == "-"*:* ]]; then
-                nameservers="$nameservers"${entry#- }";"
-                continue
-            fi
-        fi
-        nameserversec=0
-        if [ "${entry%:*}" = "nameservers" ]; then
-            nameserversec=1
-            continue
-        fi
-    done < /etc/confluent/confluent.deploycfg
-    echo dns=$nameservers >> /run/NetworkManager/system-connections/$ifname.nmconnection
-    dnsdomain=$(grep ^dnsdomain: /etc/confluent/confluent.deploycfg)
-    dnsdomain=${dnsdomain#dnsdomain: }
-    echo dns-search=$dnsdomain >> /run/NetworkManager/system-connections/$ifname.nmconnection
 fi
-echo '[proxy]' >> /run/NetworkManager/system-connections/$ifname.nmconnection
 chmod 600 /run/NetworkManager/system-connections/*.nmconnection
-confluent_websrv=$confluent_mgr
-if [[ $confluent_websrv == *:* ]]; then
-    confluent_websrv="[$confluent_websrv]"
-fi
 echo -n "Initializing ssh..."
 ssh-keygen -A
 for pubkey in /etc/ssh/ssh_host*key.pub; do
     certfile=${pubkey/.pub/-cert.pub}
     privfile=${pubkey%.pub}
-    curl -sf -X POST -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" -d @$pubkey  https://$confluent_websrv/confluent-api/self/sshcert > $certfile
+    curl -sf -X POST -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" -d @$pubkey  https://$confluent_mgr/confluent-api/self/sshcert > $certfile
     if [ -s $certfile ]; then
         echo HostCertificate $certfile >> /etc/ssh/sshd_config
     fi
@@ -345,7 +246,8 @@ for addr in $(grep ^MANAGER: /etc/confluent/confluent.info|awk '{print $2}'|sed
         confluent_urls="$confluent_urls $confluent_proto://$addr/confluent-public/os/$confluent_profile/rootimg.sfs"
     fi
 done
+confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg| awk '{print $2}')
 mkdir -p /etc/confluent
-curl -sf https://$confluent_websrv/confluent-public/os/$confluent_profile/scripts/functions > /etc/confluent/functions
+curl -sf https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/functions > /etc/confluent/functions
 . /etc/confluent/functions
 source_remote imageboot.sh

confluent_osdeploy/el8-diskless/profiles/default/scripts/add_local_repositories

@@ -7,26 +7,15 @@ import imp
 import sys
 apiclient = imp.load_source('apiclient', '/opt/confluent/bin/apiclient')
 repo = None
-server4 = None
 server = None
-server6 = None
 profile = None
-v4cfg = None
 with open('/etc/confluent/confluent.deploycfg') as dplcfgfile:
     lines = dplcfgfile.read().split('\n')
     for line in lines:
         if line.startswith('deploy_server:'):
-           _, server4 = line.split(' ', 1)
-        if line.startswith('deploy_server_v6:'):
-           _, server6 = line.split(' ', 1)
+           _, server = line.split(' ', 1)
         if line.startswith('profile: '):
            _, profile = line.split(' ', 1)
-        if line.startswith('ipv4_method: '):
-           _, v4cfg = line.split(' ', 1)
-if v4cfg == 'static' or v4cfg =='dhcp':
-    server = server4
-if not server:
-    server = '[{}]'.format(server6)
 
 path = '/confluent-public/os/{0}/distribution/'.format(profile)
 clnt = apiclient.HTTPSClient()

confluent_osdeploy/el8-diskless/profiles/default/scripts/firstboot.sh

@@ -5,18 +5,17 @@
 # noted below so custom commands are executed before
 # the script notifies confluent that install is fully complete.
 
-HOME=$(getent passwd $(whoami)|cut -d: -f 6)
-export HOME
 nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
 confluent_apikey=$(cat /etc/confluent/confluent.apikey)
 confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 export nodename confluent_mgr confluent_profile
 . /etc/confluent/functions
-(
 exec >> /var/log/confluent/confluent-firstboot.log
 exec 2>> /var/log/confluent/confluent-firstboot.log
 chmod 600 /var/log/confluent/confluent-firstboot.log
+tail -f /var/log/confluent/confluent-firstboot.log > /dev/console &
+logshowpid=$!
 while ! ping -c 1 $confluent_mgr >& /dev/null; do
 	sleep 1
 done
@@ -38,5 +37,4 @@ curl -X POST -d 'status: complete' -H "CONFLUENT_NODENAME: $nodename" -H "CONFLU
 systemctl disable firstboot
 rm /etc/systemd/system/firstboot.service
 rm /etc/confluent/firstboot.ran
-) &
-tail --pid  $! -F /var/log/confluent/confluent-firstboot.log > /dev/console
+kill $logshowpid

confluent_osdeploy/el8-diskless/profiles/default/scripts/functions

@@ -1,10 +1,6 @@
 #!/bin/bash
 function test_mgr() {
-    whost=$1
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    if curl -gs https://${whost}/confluent-api/ > /dev/null; then
+    if curl -s https://${1}/confluent-api/ > /dev/null; then
         return 0
     fi
     return 1
@@ -62,11 +58,7 @@ fetch_remote() {
     fi
     set_confluent_vars
     mkdir -p $(dirname $1)
-    whost=$confluent_mgr
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    curl -gf -sS $curlargs https://$whost/confluent-public/os/$confluent_profile/scripts/$1 > $1
+    curl -f -sS $curlargs https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/$1 > $1
     if [ $? != 0 ]; then echo $1 failed to download; return 1; fi
 }
 
@@ -173,11 +165,7 @@ run_remote_python() {
     echo Executing in $confluentscripttmpdir
     cd $confluentscripttmpdir
     mkdir -p $(dirname $1)
-    whost=$confluent_mgr
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    curl -gf -sS $curlargs https://$whost/confluent-public/os/$confluent_profile/scripts/$1 > $1
+    curl -f -sS $curlargs https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/$1 > $1
     if [ $? != 0 ]; then echo "'$*'" failed to download; return 1; fi
     confluentpython $*
     retcode=$?

confluent_osdeploy/el8-diskless/profiles/default/scripts/getinstalldisk

@@ -54,7 +54,7 @@ class DiskInfo(object):
 
     @property
     def priority(self):
-        if self.model.lower() in ('m.2 nvme 2-bay raid kit', 'thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
+        if self.model.lower() in ('thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
             return 0
         if 'imsm' in self.mdcontainer:
             return 1

confluent_osdeploy/el8-diskless/profiles/default/scripts/image2disk.py

@@ -11,8 +11,6 @@ import struct
 import sys
 import subprocess
 
-bootuuid = None
-
 def get_next_part_meta(img, imgsize):
     if img.tell() == imgsize:
         return None
@@ -55,13 +53,10 @@ class PartedRunner():
     def __init__(self, disk):
         self.disk = disk
 
-    def run(self, command, check=True):
+    def run(self, command):
         command = command.split()
         command = ['parted', '-a', 'optimal', '-s', self.disk] + command
-        if check:
-            return subprocess.check_output(command).decode('utf8')
-        else:
-            return subprocess.run(command, stdout=subprocess.PIPE).stdout.decode('utf8')
+        return subprocess.check_output(command).decode('utf8')
 
 def fixup(rootdir, vols):
     devbymount = {}
@@ -130,14 +125,9 @@ def fixup(rootdir, vols):
         sys.stdout.flush()
     for metafs in ('proc', 'sys', 'dev'):
         subprocess.check_call(['mount', '-o', 'bind', '/{}'.format(metafs), os.path.join(rootdir, metafs)])
-    if os.path.exists(os.path.join(rootdir, 'etc/lvm/devices/system.devices')):
-        os.remove(os.path.join(rootdir, 'etc/lvm/devices/system.devices'))
-    grubsyscfg = os.path.join(rootdir, 'etc/sysconfig/grub')
-    if not os.path.exists(grubsyscfg):
-        grubsyscfg = os.path.join(rootdir, 'etc/default/grub')
-    with open(grubsyscfg) as defgrubin:
+    with open(os.path.join(rootdir, 'etc/sysconfig/grub')) as defgrubin:
         defgrub = defgrubin.read().split('\n')
-    with open(grubsyscfg, 'w') as defgrubout:
+    with open(os.path.join(rootdir, 'etc/sysconfig/grub'), 'w') as defgrubout:
         for gline in defgrub:
             gline = gline.split()
             newline = []
@@ -146,34 +136,8 @@ def fixup(rootdir, vols):
                     continue
                 newline.append(ent)
             defgrubout.write(' '.join(newline) + '\n')
-    grubcfg = subprocess.check_output(['find', os.path.join(rootdir, 'boot'), '-name', 'grub.cfg']).decode('utf8').strip().replace(rootdir, '/').replace('//', '/')
-    grubcfg = grubcfg.split('\n')
-    if not grubcfg[-1]:
-        grubcfg = grubcfg[:-1]
-    if len(grubcfg) == 1:
-        grubcfg = grubcfg[0]
-    else:
-        for gcfg in grubcfg:
-            rgcfg = os.path.join(rootdir, gcfg[1:])  # gcfg has a leading / to get rid of
-            if os.stat(rgcfg).st_size > 256:
-                grubcfg = gcfg
-            else:
-                with open(rgcfg, 'r') as gin:
-                    tgrubcfg = gin.read()
-                tgrubcfg = tgrubcfg.split('\n')
-                if 'search --no-floppy --fs-uuid --set=dev' in tgrubcfg[0]:
-                    tgrubcfg[0] = 'search --no-floppy --fs-uuid --set=dev ' + bootuuid
-                with open(rgcfg, 'w') as gout:
-                    for gcline in tgrubcfg:
-                        gout.write(gcline)
-                        gout.write('\n')
-    try:
-        subprocess.check_call(['chroot', rootdir, 'grub2-mkconfig', '-o', grubcfg])
-    except Exception as e:
-        print(repr(e))
-        print(rootdir)
-        print(grubcfg)
-        time.sleep(86400)
+    grubcfg = subprocess.check_output(['find', os.path.join(rootdir, 'boot'), '-name', 'grub.cfg']).decode('utf8').strip().replace(rootdir, '/')
+    subprocess.check_call(['chroot', rootdir, 'grub2-mkconfig', '-o', grubcfg])
     newroot = None
     with open('/etc/shadow') as shadowin:
         shents = shadowin.read().split('\n')
@@ -220,7 +184,6 @@ def had_swap():
     return False
 
 def install_to_disk(imgpath):
-    global bootuuid
     lvmvols = {}
     deftotsize = 0
     mintotsize = 0
@@ -261,7 +224,7 @@ def install_to_disk(imgpath):
         instdisk = diskin.read()
     instdisk = '/dev/' + instdisk
     parted = PartedRunner(instdisk)
-    dinfo = parted.run('unit s print', check=False)
+    dinfo = parted.run('unit s print')
     dinfo = dinfo.split('\n')
     sectors = 0
     sectorsize = 0
@@ -403,14 +366,6 @@ def install_to_disk(imgpath):
                 sys.stdout.write('\x1b[1K\rDone writing {0}'.format(vol['mount']))
                 sys.stdout.write('\n')
                 sys.stdout.flush()
-                if vol['mount'] == '/boot':
-                    tbootuuid = subprocess.check_output(['blkid', vol['targetdisk']])
-                    if b'UUID="' in tbootuuid:
-                        bootuuid = tbootuuid.split(b'UUID="', 1)[1].split(b'"')[0].decode('utf8')
-
-
-
-
             subprocess.check_call(['umount', '/run/imginst/targ'])
         for vol in allvols:
             subprocess.check_call(['mount', vol['targetdisk'], '/run/imginst/targ/' + vol['mount']])
@@ -418,4 +373,4 @@ def install_to_disk(imgpath):
 
 
 if __name__ == '__main__':
-    install_to_disk(os.environ['mountsrc'])
+    install_to_disk(os.environ['mountsrc'])

confluent_osdeploy/el8-diskless/profiles/default/scripts/imageboot.sh

@@ -1,14 +1,10 @@
 . /lib/dracut-lib.sh
-confluent_whost=$confluent_mgr
-if [[ "$confluent_whost" == *:* ]]; then
-    confluent_whost="[$confluent_mgr]"
-fi
 mkdir -p /mnt/remoteimg /mnt/remote /mnt/overlay
 if [ "untethered" = "$(getarg confluent_imagemethod)" ]; then
     mount -t tmpfs untethered /mnt/remoteimg
-    curl https://$confluent_whost/confluent-public/os/$confluent_profile/rootimg.sfs -o /mnt/remoteimg/rootimg.sfs
+    curl https://$confluent_mgr/confluent-public/os/$confluent_profile/rootimg.sfs -o /mnt/remoteimg/rootimg.sfs
 else
-    confluent_urls="$confluent_urls https://$confluent_whost/confluent-public/os/$confluent_profile/rootimg.sfs"
+    confluent_urls="$confluent_urls https://$confluent_mgr/confluent-public/os/$confluent_profile/rootimg.sfs"
     /opt/confluent/bin/urlmount $confluent_urls /mnt/remoteimg
 fi
 /opt/confluent/bin/confluent_imginfo /mnt/remoteimg/rootimg.sfs > /tmp/rootimg.info
@@ -16,8 +12,8 @@ loopdev=$(losetup -f)
 export mountsrc=$loopdev
 losetup -r $loopdev /mnt/remoteimg/rootimg.sfs
 if grep '^Format: confluent_crypted' /tmp/rootimg.info > /dev/null; then
-    while ! curl -sf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" https://$confluent_whost/confluent-api/self/profileprivate/pending/rootimg.key > /tmp/rootimg.key; do
-        echo "Unable to retrieve private key from $confluent_mgr (verify that confluent can access /var/lib/confluent/private/os/$confluent_profile/pending/rootimg.key)"
+    while ! curl -sf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" https://$confluent_mgr/confluent-api/self/profileprivate/pending/rootimg.key > /tmp/rootimg.key; do
+        echo "Unable to retrieve private key from $confluent_mgr (verify that confluent can access /var/lib/confluent/private/$confluent_profile/pending/rootimg.key)"
         sleep 1
     done
     cipher=$(head -n 1 /tmp/rootimg.key)
@@ -107,15 +103,15 @@ echo 'Host *' >> $sshconf
 echo '    HostbasedAuthentication yes' >> $sshconf
 echo '    EnableSSHKeysign yes' >> $sshconf
 echo '    HostbasedKeyTypes *ed25519*' >> $sshconf
-curl -sf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" https://$confluent_whost/confluent-api/self/nodelist > /sysroot/etc/ssh/shosts.equiv
+curl -sf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" https://$confluent_mgr/confluent-api/self/nodelist > /sysroot/etc/ssh/shosts.equiv
 cp /sysroot/etc/ssh/shosts.equiv /sysroot/root/.shosts
 chmod 640 /sysroot/etc/ssh/*_key
 chroot /sysroot chgrp ssh_keys /etc/ssh/*_key
 cp /tls/*.pem /sysroot/etc/pki/ca-trust/source/anchors/
 chroot /sysroot/ update-ca-trust
-curl -sf https://$confluent_whost/confluent-public/os/$confluent_profile/scripts/onboot.service > /sysroot/etc/systemd/system/onboot.service
+curl -sf https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/onboot.service > /sysroot/etc/systemd/system/onboot.service
 mkdir -p /sysroot/opt/confluent/bin
-curl -sf https://$confluent_whost/confluent-public/os/$confluent_profile/scripts/onboot.sh > /sysroot/opt/confluent/bin/onboot.sh
+curl -sf https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/onboot.sh > /sysroot/opt/confluent/bin/onboot.sh
 chmod +x /sysroot/opt/confluent/bin/onboot.sh
 cp /opt/confluent/bin/apiclient /sysroot/opt/confluent/bin
 ln -s /etc/systemd/system/onboot.service /sysroot/etc/systemd/system/multi-user.target.wants/onboot.service
@@ -127,7 +123,5 @@ if grep installtodisk /proc/cmdline > /dev/null; then
 fi
 mv /lib/modules/$(uname -r) /lib/modules/$(uname -r)-ramfs
 ln -s /sysroot/lib/modules/$(uname -r) /lib/modules/
-mv /lib/firmware /lib/firmware-ramfs
-ln -s /sysroot/lib/firmware /lib/firmware
 kill $(grep -l ^/usr/lib/systemd/systemd-udevd  /proc/*/cmdline|cut -d/ -f 3)
 exec /opt/confluent/bin/start_root

confluent_osdeploy/el8-diskless/profiles/default/scripts/installimage

@@ -31,9 +31,6 @@ if [ ! -f /sysroot/tmp/installdisk ]; then
 fi
 lvm vgchange -a n
 udevadm control -e
-if [ -f /sysroot/etc/lvm/devices/system.devices ]; then
-    rm /sysroot/etc/lvm/devices/system.devices
-fi
 chroot /sysroot /usr/lib/systemd/systemd-udevd --daemon
 chroot /sysroot bash -c "source /etc/confluent/functions; run_remote_python image2disk.py"
 echo "Port 22" >> /etc/ssh/sshd_config

confluent_osdeploy/el8-diskless/profiles/default/scripts/onboot.sh

@@ -7,15 +7,8 @@
 
 nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
 confluent_apikey=$(cat /etc/confluent/confluent.apikey)
-v4meth=$(grep ^ipv4_method: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-if [ "$v4meth" = "null" -o -z "$v4meth" ]; then
-    confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-fi
-if [ -z "$confluent_mgr" ]; then
-    confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-fi
+confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-timedatectl set-timezone $(grep ^timezone: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 export nodename confluent_mgr confluent_profile
 . /etc/confluent/functions
 mkdir -p /var/log/confluent

confluent_osdeploy/el8-diskless/profiles/default/scripts/syncfileclient

@@ -1,5 +1,4 @@
-#!/usr/bin/python3
-import subprocess
+#!/usr/bin/python
 import importlib
 import tempfile
 import json
@@ -212,20 +211,7 @@ def synchronize():
     appendoncedir = tempfile.mkdtemp()
     try:
         ac = apiclient.HTTPSClient()
-        myips = []
-        ipaddrs = subprocess.check_output(['ip', '-br', 'a']).split(b'\n')
-        for line in ipaddrs:
-            isa = line.split()
-            if len(isa) < 3 or isa[1] != b'UP':
-                continue
-            for addr in isa[2:]:
-                if addr.startswith(b'fe80::') or addr.startswith(b'169.254'):
-                    continue
-                addr = addr.split(b'/')[0]
-                if not isinstance(addr, str):
-                    addr = addr.decode('utf8')
-                myips.append(addr)
-        data = json.dumps({'merge': tmpdir, 'appendonce': appendoncedir, 'myips': myips})
+        data = json.dumps({'merge': tmpdir, 'appendonce': appendoncedir})
         status, rsp = ac.grab_url_with_status('/confluent-api/self/remotesyncfiles', data)
         if status == 202:
             lastrsp = ''

confluent_osdeploy/el8/initramfs/usr/lib/dracut/hooks/pre-trigger/01-confluent.sh

@@ -1,7 +1,5 @@
 #!/bin/sh
 [ -e /tmp/confluent.initq ] && return 0
-. /lib/dracut-lib.sh
-setsid sh -c 'exec bash <> /dev/tty2 >&0 2>&1' &
 udevadm trigger
 udevadm trigger --type=devices --action=add
 udevadm settle
@@ -40,127 +38,17 @@ umask 0077
 mkdir -p /etc/confluent
 echo -n > /etc/confluent/confluent.info
 umask $oum
-TRIES=5
-while [ ! -e /dev/disk/by-label ] && [ $TRIES -gt 0 ]; do
-    sleep 2
-    TRIES=$((TRIES - 1))
-done
-if [ -e /dev/disk/by-label/CNFLNT_IDNT ]; then
-    tmnt=/tmp/idntmnt
-    mkdir -p $tmnt
-    tcfg=/tmp/idnttmp
-    mount /dev/disk/by-label/CNFLNT_IDNT $tmnt
-    cd $tmnt
-    deploysrvs=$(sed -n '/^deploy_servers:/, /^[^-]/p' cnflnt.yml |grep ^-|sed -e 's/^- //'|grep -v :)
-    nodename=$(grep ^nodename: cnflnt.yml|awk '{print $2}')
-    sed -n '/^net_cfgs:/, /^[^- ]/{/^[^- ]/!p}' cnflnt.yml |sed -n '/^-/, /^-/{/^-/!p}'| sed -e 's/^[- ]*//'> $tcfg
-    autoconfigmethod=$(grep ^ipv4_method: $tcfg)
-    autoconfigmethod=${autoconfigmethod#ipv4_method: }
-     for i in /sys/class/net/*; do
-        ip link set $(basename $i) down
-        udevadm info $i | grep ID_NET_DRIVER=cdc_ether > /dev/null &&  continue
-        ip link set $(basename $i) up
-    done
-    for NICGUESS in $(ip link|grep LOWER_UP|grep -v LOOPBACK| awk '{print $2}' | sed -e 's/:$//'); do
-        if [ "$autoconfigmethod" = "dhcp" ]; then
-            /usr/libexec/nm-initrd-generator ip=$NICGUESS:dhcp
-        else
-            v4addr=$(grep ^ipv4_address: $tcfg)
-            v4addr=${v4addr#ipv4_address: }
-            v4plen=${v4addr#*/}
-            v4addr=${v4addr%/*}
-            v4gw=$(grep ^ipv4_gateway: $tcfg)
-            v4gw=${v4gw#ipv4_gateway: }
-            ip addr add dev $NICGUESS $v4addr/$v4plen
-            if [ "$v4gw" = "null" ]; then
-                v4gw=""
-            fi
-            if [ ! -z "$v4gw" ]; then
-                ip route add default via $v4gw
-            fi
-            v4nm=$(grep ipv4_netmask: $tcfg)
-            v4nm=${v4nm#ipv4_netmask: }
-            DETECTED=0
-            for dsrv in $deploysrvs; do
-                if curl --capath /tls/ -s --connect-timeout 3 https://$dsrv/confluent-public/ > /dev/null; then
-                    rm /run/NetworkManager/system-connections/*
-                    /usr/libexec/nm-initrd-generator ip=$v4addr::$v4gw:$v4nm:$hostname:$NICGUESS:none
-                    DETECTED=1
-                    ifname=$NICGUESS
-                    break
-                fi
-            done
-            if [ ! -z "$v4gw" ]; then
-                ip route del default via $v4gw
-            fi
-            ip addr flush dev $NICGUESS
-            if [ $DETECTED = 1 ]; then
-                break
-            fi
-        fi
-    done
-    NetworkManager --configure-and-quit=initrd --no-daemon
-    hmackeyfile=/tmp/cnflnthmackeytmp
-    echo -n $(grep ^apitoken: cnflnt.yml|awk '{print $2}') > $hmackeyfile
-    cd -
-    umount $tmnt
-    passfile=/tmp/cnflnttmppassfile
-    passcrypt=/tmp/cnflntcryptfile
-    hmacfile=/tmp/cnflnthmacfile
-    ln -s /opt/confluent/bin/clortho /opt/confluent/bin/genpasshmac
-    /opt/confluent/bin/genpasshmac $passfile $passcrypt $hmacfile $hmackeyfile
-    echo 'NODENAME: '$nodename > /etc/confluent/confluent.info
-    for deploysrv in $deploysrvs; do
-        echo 'MANAGER: '$deploysrv >> /etc/confluent/confluent.info
-    done
-    for deployer in $deploysrvs; do
-        if curl --capath /tls/ -f -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_CRYPTHMAC: $(cat $hmacfile)" -d@$passcrypt -k https://$deployer/confluent-api/self/registerapikey; then
-            cp $passfile /etc/confluent/confluent.apikey
-            confluent_apikey=$(cat /etc/confluent/confluent.apikey)
-            curl --capath /tls/ -sf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" https://$deployer/confluent-api/self/deploycfg2 > /etc/confluent/confluent.deploycfg
-            confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg)
-            confluent_profile=${confluent_profile#profile: }
-            mgr=$deployer
-            break
-        fi
-    done
-fi
 cd /sys/class/net
-if ! grep MANAGER: /etc/confluent/confluent.info; then
-    confluentsrv=$(getarg confluent)
-    if [ ! -z "$confluentsrv" ]; then
-        mgr=$confluentsrv
-        if [[ "$confluentsrv" = *":"* ]]; then
-            mgr="[$mgr]"
-            confluenthttpsrv=[$confluentsrv]
-            /usr/libexec/nm-initrd-generator ip=:dhcp6
-        else
-            confluenthttpsrv=$confluentsrv
-            /usr/libexec/nm-initrd-generator ip=:dhcp
-        fi
-        NetworkManager --configure-and-quit=initrd --no-daemon
-        myids=uuid=$(cat /sys/devices/virtual/dmi/id/product_uuid)
-        for mac in $(ip -br link|grep -v LOOPBACK|awk '{print $3}'); do
-            myids=$myids"/mac="$mac
-        done
-        myname=$(curl --capath /tls/ -sH "CONFLUENT_IDS: $myids" https://$confluenthttpsrv/confluent-api/self/whoami)
-        if [ ! -z "$myname" ]; then
-            echo NODENAME: $myname > /etc/confluent/confluent.info
-            echo MANAGER: $confluentsrv >> /etc/confluent/confluent.info
-            echo EXTMGRINFO: $confluentsrv'||1' >> /etc/confluent/confluent.info
-        fi
-    fi
-    while ! grep ^EXTMGRINFO: /etc/confluent/confluent.info | awk -F'|' '{print $3}' | grep 1 >& /dev/null && [ "$TRIES" -lt 60 ]; do
-        TRIES=$((TRIES + 1))
-        for currif in *; do
-            echo 0 > /proc/sys/net/ipv6/conf/${currif}/autoconf
-            ip link set $currif up
-        done
-        /opt/confluent/bin/copernicus -t > /etc/confluent/confluent.info
+while ! grep ^EXTMGRINFO: /etc/confluent/confluent.info | awk -F'|' '{print $3}' | grep 1 >& /dev/null && [ "$TRIES" -lt 60 ]; do
+    TRIES=$((TRIES + 1))
+    for currif in *; do
+        echo 0 > /proc/sys/net/ipv6/conf/${currif}/autoconf
+        ip link set $currif up
     done
-    grep ^EXTMGRINFO: /etc/confluent/confluent.info || return 0  # Do absolutely nothing if no data at all yet
-fi
+    /opt/confluent/bin/copernicus -t > /etc/confluent/confluent.info
+done
 cd /
+grep ^EXTMGRINFO: /etc/confluent/confluent.info || return 0  # Do absolutely nothing if no data at all yet
 echo -n "" > /tmp/confluent.initq
 # restart cmdline
 echo -n "" > /etc/cmdline.d/01-confluent.conf
@@ -177,18 +65,11 @@ fi
 while ! confluentpython /opt/confluent/bin/apiclient $errout /confluent-api/self/deploycfg2 > /etc/confluent/confluent.deploycfg; do
 	sleep 10
 done
-ifidx=$(cat /tmp/confluent.ifidx 2> /dev/null)
-if [ -z "$ifname" ]; then
-    if [ ! -z "$ifidx" ]; then
-        ifname=$(ip link |grep ^$ifidx:|awk '{print $2}')
-        ifname=${ifname%:}
-        ifname=${ifname%@*}
-        echo $ifname > /tmp/net.ifaces
-    else
-        ip -br a|grep UP|awk '{print $1}' > /tmp/net.ifaces
-        ifname=$(cat /tmp/net.ifaces)
-    fi
-fi
+ifidx=$(cat /tmp/confluent.ifidx)
+ifname=$(ip link |grep ^$ifidx:|awk '{print $2}')
+ifname=${ifname%:}
+ifname=${ifname%@*}
+echo $ifname > /tmp/net.ifaces
 
 dnsdomain=$(grep ^dnsdomain: /etc/confluent/confluent.deploycfg)
 dnsdomain=${dnsdomain#dnsdomain: }
@@ -203,8 +84,7 @@ v4cfg=${v4cfg#ipv4_method: }
 if [ "$v4cfg" = "static" ] || [ "$v4cfg" = "dhcp" ]; then
     mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
     mgr=${mgr#deploy_server: }
-fi
-if [ -z "$mgr" ]; then
+else
     mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg)
     mgr=${mgr#deploy_server_v6: }
     mgr="[$mgr]"

confluent_osdeploy/el8/profiles/default/ansible/firstboot.d/README.txt

@@ -1,10 +1,6 @@
 Ansible playbooks ending in .yml or .yaml that are placed into this directory will be executed at the
 appropriate phase of the install process.
 
-Alternatively, plays may be placed in /var/lib/confluent/private/os/<profilename>/ansible/<directory>.
-This prevents public clients from being able to read the plays, which is not necessary for them to function,
-and may protect them from divulging material contained in the plays or associated roles.
-
 The 'hosts' may be omitted, and if included will be ignored, replaced with the host that is specifically
 requesting the playbooks be executed.
 

confluent_osdeploy/el8/profiles/default/ansible/post.d/README.txt

@@ -1,10 +1,6 @@
 Ansible playbooks ending in .yml or .yaml that are placed into this directory will be executed at the
 appropriate phase of the install process.
 
-Alternatively, plays may be placed in /var/lib/confluent/private/os/<profilename>/ansible/<directory>.
-This prevents public clients from being able to read the plays, which is not necessary for them to function,
-and may protect them from divulging material contained in the plays or associated roles.
-
 The 'hosts' may be omitted, and if included will be ignored, replaced with the host that is specifically
 requesting the playbooks be executed.
 

confluent_osdeploy/el8/profiles/default/initprofile.sh

@@ -2,10 +2,6 @@
 sed -i 's/centos/CentOS/; s/rhel/Red Hat Enterprise Linux/; s/oraclelinux/Oracle Linux/; s/alma/AlmaLinux/' $2/profile.yaml
 ln -s $1/images/pxeboot/vmlinuz $2/boot/kernel && \
 ln -s $1/images/pxeboot/initrd.img $2/boot/initramfs/distribution
-mkdir -p $2/boot/efi/boot
-if [ -e $1/EFI/BOOT/BOOTAA64.EFI ]; then
-    ln -s $1/EFI/BOOT/BOOTAA64.EFI $1/EFI/BOOT/grubaa64.efi $2/boot/efi/boot/
-else
-    ln -s $1/EFI/BOOT/BOOTX64.EFI $1/EFI/BOOT/grubx64.efi $2/boot/efi/boot/
-fi
+mkdir -p $2/boot/efi/boot && \
+ln -s $1/EFI/BOOT/BOOTX64.EFI $1/EFI/BOOT/grubx64.efi $2/boot/efi/boot/
 

confluent_osdeploy/el8/profiles/default/kickstart

@@ -59,16 +59,10 @@ v4cfg=${v4cfg#ipv4_method: }
 if [ "$v4cfg" = "static" ] || [ "$v4cfg" = "dhcp" ]; then
     confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server: }
-fi
-if [ -z "$confluent_mgr" ]; then
+else
     confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server_v6: }
-    if [ -z "$confluent_mgr" ]; then
-        confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
-        confluent_mgr=${confluent_mgr#deploy_server: }
-    else
-        confluent_mgr="[$confluent_mgr]"
-    fi
+    confluent_mgr="[$confluent_mgr]"
 fi
 confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg |awk '{print $2}')
 curl -f https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/pre.sh > /tmp/preinst.sh
@@ -83,16 +77,10 @@ v4cfg=${v4cfg#ipv4_method: }
 if [ "$v4cfg" = "static" ] || [ "$v4cfg" = "dhcp" ]; then
     confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server: }
-fi
-if [ -z "$confluent_mgr" ]; then
+else
     confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server_v6: }
-    if [ -z "$confluent_mgr" ]; then
-        confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
-        confluent_mgr=${confluent_mgr#deploy_server: }
-    else
-        confluent_mgr="[$confluent_mgr]"
-    fi
+    confluent_mgr="[$confluent_mgr]"
 fi
 curl -f https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/prechroot.sh > /tmp/postinst.sh
 . /tmp/postinst.sh
@@ -116,16 +104,10 @@ v4cfg=${v4cfg#ipv4_method: }
 if [ "$v4cfg" = "static" ] || [ "$v4cfg" = "dhcp" ]; then
     confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server: }
-fi
-if [ -z "$confluent_mgr" ]; then
+else
     confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server_v6: }
-    if [ -z "$confluent_mgr" ]; then
-        confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
-        confluent_mgr=${confluent_mgr#deploy_server: }
-    else
-        confluent_mgr="[$confluent_mgr]"
-    fi
+    confluent_mgr="[$confluent_mgr]"
 fi
 curl -f https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/post.sh > /tmp/postinst.sh
 . /tmp/postinst.sh

confluent_osdeploy/el8/profiles/default/scripts/add_local_repositories

@@ -12,25 +12,14 @@ apiclient = importlib.util.module_from_spec(modspec)
 modspec.loader.exec_module(apiclient)
 repo = None
 server = None
-v4cfg = None
-server4 = None
-server6 = None
 profile = None
 with open('/etc/confluent/confluent.deploycfg') as dplcfgfile:
     lines = dplcfgfile.read().split('\n')
     for line in lines:
         if line.startswith('deploy_server:'):
-           _, server4 = line.split(' ', 1)
-        if line.startswith('deploy_server_v6:'):
-           _, server6 = line.split(' ', 1)
+           _, server = line.split(' ', 1)
         if line.startswith('profile: '):
            _, profile = line.split(' ', 1)
-        if line.startswith('ipv4_method: '):
-           _, v4cfg = line.split(' ', 1)
-if v4cfg == 'static' or v4cfg =='dhcp':
-    server = server4
-if not server:
-    server = '[{}]'.format(server6)
 
 path = '/confluent-public/os/{0}/distribution/'.format(profile)
 clnt = apiclient.HTTPSClient()

confluent_osdeploy/el8/profiles/default/scripts/firstboot.sh

@@ -1,6 +1,4 @@
 #!/bin/sh
-HOME=$(getent passwd $(whoami)|cut -d: -f 6)
-export HOME
 
 # This script is executed on the first boot after install has
 # completed. It is best to edit the middle of the file as
@@ -15,41 +13,30 @@ if [ "$v4cfg" = "static" ] || [ "$v4cfg" = "dhcp" ]; then
     confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server: }
     confluent_pingtarget=$confluent_mgr
-fi
-if [ -z "$confluent_mgr" ]; then
+else
     confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server_v6: }
-    if [ -z "$confluent_mgr" ]; then
-        confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
-        confluent_mgr=${confluent_mgr#deploy_server: }
-        confluent_pingtarget=$confluent_mgr
-    else
-        confluent_pingtarget=$confluent_mgr
-        confluent_mgr="[$confluent_mgr]"
-    fi
+    confluent_pingtarget=$confluent_mgr
+    confluent_mgr="[$confluent_mgr]"
 fi
 confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 export nodename confluent_mgr confluent_profile
 . /etc/confluent/functions
-(
 exec >> /var/log/confluent/confluent-firstboot.log
 exec 2>> /var/log/confluent/confluent-firstboot.log
 chmod 600 /var/log/confluent/confluent-firstboot.log
-if [ ! -f /etc/confluent/firstboot.ran ]; then
-    cat /etc/confluent/tls/*.pem >> /etc/pki/tls/certs/ca-bundle.crt
-    confluentpython /root/confignet
-    rm /root/confignet
-fi
-
-
+tail -f /var/log/confluent/confluent-firstboot.log > /dev/console &
+logshowpid=$!
 while ! ping -c 1 $confluent_pingtarget >& /dev/null; do
 	sleep 1
 done
 
-
 if [ ! -f /etc/confluent/firstboot.ran ]; then
     touch /etc/confluent/firstboot.ran
 
+    cat /etc/confluent/tls/*.pem >> /etc/pki/tls/certs/ca-bundle.crt
+    run_remote_python confignet
+
     run_remote firstboot.custom
     # Firstboot scripts may be placed into firstboot.d, e.g. firstboot.d/01-firstaction.sh, firstboot.d/02-secondaction.sh
     run_remote_parts firstboot.d
@@ -62,5 +49,4 @@ curl -X POST -d 'status: complete' -H "CONFLUENT_NODENAME: $nodename" -H "CONFLU
 systemctl disable firstboot
 rm /etc/systemd/system/firstboot.service
 rm /etc/confluent/firstboot.ran
-) &
-tail --pid $! -n 0 -F /var/log/confluent/confluent-firstboot.log > /dev/console
+kill $logshowpid

confluent_osdeploy/el8/profiles/default/scripts/functions

@@ -1,10 +1,6 @@
 #!/bin/bash
 function test_mgr() {
-    whost=$1
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    if curl -gs https://${whost}/confluent-api/ > /dev/null; then
+    if curl -s https://${1}/confluent-api/ > /dev/null; then
         return 0
     fi
     return 1
@@ -62,11 +58,7 @@ fetch_remote() {
     fi
     set_confluent_vars
     mkdir -p $(dirname $1)
-    whost=$confluent_mgr
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    curl -gf -sS $curlargs https://$whost/confluent-public/os/$confluent_profile/scripts/$1 > $1
+    curl -f -sS $curlargs https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/$1 > $1
     if [ $? != 0 ]; then echo $1 failed to download; return 1; fi
 }
 
@@ -173,11 +165,7 @@ run_remote_python() {
     echo Executing in $confluentscripttmpdir
     cd $confluentscripttmpdir
     mkdir -p $(dirname $1)
-    whost=$confluent_mgr
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    curl -gf -sS $curlargs https://$whost/confluent-public/os/$confluent_profile/scripts/$1 > $1
+    curl -f -sS $curlargs https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/$1 > $1
     if [ $? != 0 ]; then echo "'$*'" failed to download; return 1; fi
     confluentpython $*
     retcode=$?

confluent_osdeploy/el8/profiles/default/scripts/getinstalldisk

@@ -54,7 +54,7 @@ class DiskInfo(object):
 
     @property
     def priority(self):
-        if self.model.lower() in ('m.2 nvme 2-bay raid kit', 'thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
+        if self.model.lower() in ('thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
             return 0
         if 'imsm' in self.mdcontainer:
             return 1

confluent_osdeploy/el8/profiles/default/scripts/post.sh

@@ -47,8 +47,5 @@ run_remote_parts post.d
 
 # Induce execution of remote configuration, e.g. ansible plays in ansible/post.d/
 run_remote_config post.d
-cd /root
-fetch_remote confignet
-cd -
 curl -sf -X POST -d 'status: staged' -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $apikey" https://$confluent_mgr/confluent-api/self/updatestatus
 kill $logshowpid

confluent_osdeploy/el8/profiles/default/scripts/pre.sh

@@ -77,7 +77,6 @@ if [ ! -z "$blargs" ]; then
     echo "bootloader $blargs" > /tmp/grubpw
 fi
 ssh-keygen -A
-rm /etc/ssh/ssh_host_dsa_key*
 for pubkey in /etc/ssh/ssh_host*key.pub; do
     certfile=${pubkey/.pub/-cert.pub}
     curl -sf -X POST -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" -d @$pubkey https://$confluent_mgr/confluent-api/self/sshcert > $certfile

confluent_osdeploy/el8/profiles/default/scripts/syncfileclient

@@ -1,5 +1,4 @@
-#!/usr/bin/python3
-import subprocess
+#!/usr/bin/python
 import importlib
 import tempfile
 import json
@@ -212,20 +211,7 @@ def synchronize():
     appendoncedir = tempfile.mkdtemp()
     try:
         ac = apiclient.HTTPSClient()
-        myips = []
-        ipaddrs = subprocess.check_output(['ip', '-br', 'a']).split(b'\n')
-        for line in ipaddrs:
-            isa = line.split()
-            if len(isa) < 3 or isa[1] != b'UP':
-                continue
-            for addr in isa[2:]:
-                if addr.startswith(b'fe80::') or addr.startswith(b'169.254'):
-                    continue
-                addr = addr.split(b'/')[0]
-                if not isinstance(addr, str):
-                    addr = addr.decode('utf8')
-                myips.append(addr)
-        data = json.dumps({'merge': tmpdir, 'appendonce': appendoncedir, 'myips': myips})
+        data = json.dumps({'merge': tmpdir, 'appendonce': appendoncedir})
         status, rsp = ac.grab_url_with_status('/confluent-api/self/remotesyncfiles', data)
         if status == 202:
             lastrsp = ''

confluent_osdeploy/el9-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh

@@ -28,7 +28,7 @@ get_remote_apikey() {
 root=1
 rootok=1
 netroot=confluent
-echo -ne '\033[H\033[2J\033[3J'
+#clear
 mkdir -p /etc/ssh
 mkdir -p /var/tmp/
 mkdir -p /var/empty/sshd
@@ -124,7 +124,7 @@ while [ $ready = "0" ]; do
         confluent_mgr="[$confluent_mgr]"
     fi
     tmperr=$(mktemp)
-    curl -sSf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" https://$confluent_mgr/confluent-api/self/deploycfg2 > /etc/confluent/confluent.deploycfg 2> $tmperr
+    curl -sSf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" https://$confluent_mgr/confluent-api/self/deploycfg > /etc/confluent/confluent.deploycfg 2> $tmperr
     if grep 401 $tmperr > /dev/null; then
         confluent_apikey=""
         if [ -n "$lasthdl" ]; then
@@ -148,36 +148,13 @@ if [ -c /dev/tpmrm0 ]; then
     tpm2_pcrextend 15:sha256=2fbe96c50dde38ce9cd2764ddb79c216cfbcd3499568b1125450e60c45dd19f2
 fi
 umask $oldumask
-mkdir -p /run/NetworkManager/system-connections
-cat > /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-[connection]
-EOC
-echo id=${ifname} >> /run/NetworkManager/system-connections/$ifname.nmconnection
-echo uuid=$(uuidgen) >> /run/NetworkManager/system-connections/$ifname.nmconnection
-cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-type=ethernet
-autoconnect-retries=1
-EOC
-echo interface-name=$ifname >> /run/NetworkManager/system-connections/$ifname.nmconnection
-cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-multi-connect=1
-permissions=
-wait-device-timeout=60000
-
-[ethernet]
-mac-address-blacklist=
-
-EOC
 autoconfigmethod=$(grep ^ipv4_method: /etc/confluent/confluent.deploycfg |awk '{print $2}')
-auto6configmethod=$(grep ^ipv6_method: /etc/confluent/confluent.deploycfg |awk '{print $2}')
 if [ "$autoconfigmethod" = "dhcp" ]; then
     echo -n "Attempting to use dhcp to bring up $ifname..."
     dhclient $ifname
     echo "Complete:"
     ip addr show dev $ifname
-    confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg| awk '{print $2}')
-elif [ "$autoconfigmethod" = "static" ]; then
-    confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg| awk '{print $2}')
+else
     v4addr=$(grep ^ipv4_address: /etc/confluent/confluent.deploycfg)
     v4addr=${v4addr#ipv4_address: }
     v4gw=$(grep ^ipv4_gateway: /etc/confluent/confluent.deploycfg)
@@ -192,7 +169,27 @@ elif [ "$autoconfigmethod" = "static" ]; then
     if [ ! -z "$v4gw" ]; then
         ip route add default via $v4gw
     fi
-    echo '[ipv4]' >> /run/NetworkManager/system-connections/$ifname.nmconnection
+    mkdir -p /run/NetworkManager/system-connections
+    cat > /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
+[connection]
+EOC
+    echo id=${ifname} >> /run/NetworkManager/system-connections/$ifname.nmconnection
+    echo uuid=$(uuidgen) >> /run/NetworkManager/system-connections/$ifname.nmconnection
+    cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
+type=ethernet
+autoconnect-retries=1
+EOC
+    echo interface-name=$ifname >> /run/NetworkManager/system-connections/$ifname.nmconnection
+    cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
+multi-connect=1
+permissions=
+wait-device-timeout=60000
+
+[ethernet]
+mac-address-blacklist=
+
+[ipv4]
+EOC
     echo address1=$v4addr/$v4nm >> /run/NetworkManager/system-connections/$ifname.nmconnection
     if [ ! -z "$v4gw" ]; then
         echo gateway=$v4gw >> /run/NetworkManager/system-connections/$ifname.nmconnection
@@ -201,7 +198,7 @@ elif [ "$autoconfigmethod" = "static" ]; then
     nameservers=""
     while read -r entry; do
         if [ $nameserversec = 1 ]; then
-            if [[ $entry == "-"*.* ]]; then
+            if [[ $entry == "-"* ]]; then
                 nameservers="$nameservers"${entry#- }";"
                 continue
             fi
@@ -224,69 +221,16 @@ method=manual
 addr-gen-mode=eui64
 method=auto
 
+[proxy]
 EOC
-elif [ "$auto6configmethod" = "static" ]; then
-    confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg| awk '{print $2}')
-    v6addr=$(grep ^ipv6_address: /etc/confluent/confluent.deploycfg)
-    v6addr=${v6addr#ipv6_address: }
-    v6gw=$(grep ^ipv6_gateway: /etc/confluent/confluent.deploycfg)
-    v6gw=${v6gw#ipv6_gateway: }
-    if [ "$v6gw" = "null" ]; then
-        v6gw=""
-    fi
-    v6nm=$(grep ^ipv6_prefix: /etc/confluent/confluent.deploycfg)
-    v6nm=${v6nm#ipv6_prefix: }
-    echo "Setting up $ifname as static at $v6addr/$v6nm"
-    ip addr add dev $ifname $v6addr/$v6nm
-
-    cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-[ipv4]
-dhcp-timeout=90
-dhcp-vendor-class-identifier=anaconda-Linux
-method=disabled
-
-[ipv6]
-addr-gen-mode=eui64
-method=manual
-may-fail=false
-EOC
-    echo address1=$v6addr/$v6nm >> /run/NetworkManager/system-connections/$ifname.nmconnection
-    if [ ! -z "$v6gw" ]; then
-        ip route add default via $v6gw
-        echo gateway=$v6gw >> /run/NetworkManager/system-connections/$ifname.nmconnection
-    fi
-    nameserversec=0
-    nameservers=""
-    while read -r entry; do
-        if [ $nameserversec = 1 ]; then
-            if [[ $entry == "-"*:* ]]; then
-                nameservers="$nameservers"${entry#- }";"
-                continue
-            fi
-        fi
-        nameserversec=0
-        if [ "${entry%:*}" = "nameservers" ]; then
-            nameserversec=1
-            continue
-        fi
-    done < /etc/confluent/confluent.deploycfg
-    echo dns=$nameservers >> /run/NetworkManager/system-connections/$ifname.nmconnection
-    dnsdomain=$(grep ^dnsdomain: /etc/confluent/confluent.deploycfg)
-    dnsdomain=${dnsdomain#dnsdomain: }
-    echo dns-search=$dnsdomain >> /run/NetworkManager/system-connections/$ifname.nmconnection
 fi
-echo '[proxy]' >> /run/NetworkManager/system-connections/$ifname.nmconnection
 chmod 600 /run/NetworkManager/system-connections/*.nmconnection
-confluent_websrv=$confluent_mgr
-if [[ $confluent_websrv == *:* ]]; then
-    confluent_websrv="[$confluent_websrv]"
-fi
 echo -n "Initializing ssh..."
 ssh-keygen -A
 for pubkey in /etc/ssh/ssh_host*key.pub; do
     certfile=${pubkey/.pub/-cert.pub}
     privfile=${pubkey%.pub}
-    curl -sf -X POST -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" -d @$pubkey  https://$confluent_websrv/confluent-api/self/sshcert > $certfile
+    curl -sf -X POST -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" -d @$pubkey  https://$confluent_mgr/confluent-api/self/sshcert > $certfile
     if [ -s $certfile ]; then
         echo HostCertificate $certfile >> /etc/ssh/sshd_config
     fi
@@ -303,7 +247,8 @@ for addr in $(grep ^MANAGER: /etc/confluent/confluent.info|awk '{print $2}'|sed
         confluent_urls="$confluent_urls $confluent_proto://$addr/confluent-public/os/$confluent_profile/rootimg.sfs"
     fi
 done
+confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg| awk '{print $2}')
 mkdir -p /etc/confluent
-curl -sf https://$confluent_websrv/confluent-public/os/$confluent_profile/scripts/functions > /etc/confluent/functions
+curl -sf https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/functions > /etc/confluent/functions
 . /etc/confluent/functions
 source_remote imageboot.sh

confluent_osdeploy/el9-diskless/profiles/default/scripts/add_local_repositories

@@ -12,25 +12,14 @@ apiclient = importlib.util.module_from_spec(modspec)
 modspec.loader.exec_module(apiclient)
 repo = None
 server = None
-v4cfg = None
-server4 = None
-server6 = None
 profile = None
 with open('/etc/confluent/confluent.deploycfg') as dplcfgfile:
     lines = dplcfgfile.read().split('\n')
     for line in lines:
         if line.startswith('deploy_server:'):
-           _, server4 = line.split(' ', 1)
-        if line.startswith('deploy_server_v6:'):
-           _, server6 = line.split(' ', 1)
+           _, server = line.split(' ', 1)
         if line.startswith('profile: '):
            _, profile = line.split(' ', 1)
-        if line.startswith('ipv4_method: '):
-           _, v4cfg = line.split(' ', 1)
-if v4cfg == 'static' or v4cfg =='dhcp':
-    server = server4
-if not server:
-    server = '[{}]'.format(server6)
 
 path = '/confluent-public/os/{0}/distribution/'.format(profile)
 clnt = apiclient.HTTPSClient()

confluent_osdeploy/el9-diskless/profiles/default/scripts/firstboot.sh

@@ -5,18 +5,17 @@
 # noted below so custom commands are executed before
 # the script notifies confluent that install is fully complete.
 
-HOME=$(getent passwd $(whoami)|cut -d: -f 6)
-export HOME
 nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
 confluent_apikey=$(cat /etc/confluent/confluent.apikey)
 confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 export nodename confluent_mgr confluent_profile
 . /etc/confluent/functions
-(
 exec >> /var/log/confluent/confluent-firstboot.log
 exec 2>> /var/log/confluent/confluent-firstboot.log
 chmod 600 /var/log/confluent/confluent-firstboot.log
+tail -f /var/log/confluent/confluent-firstboot.log > /dev/console &
+logshowpid=$!
 while ! ping -c 1 $confluent_mgr >& /dev/null; do
 	sleep 1
 done
@@ -38,5 +37,4 @@ curl -X POST -d 'status: complete' -H "CONFLUENT_NODENAME: $nodename" -H "CONFLU
 systemctl disable firstboot
 rm /etc/systemd/system/firstboot.service
 rm /etc/confluent/firstboot.ran
-) &
-tail --pid  $! -F /var/log/confluent/confluent-firstboot.log > /dev/console
+kill $logshowpid

confluent_osdeploy/el9-diskless/profiles/default/scripts/functions

@@ -1,10 +1,6 @@
 #!/bin/bash
 function test_mgr() {
-    whost=$1
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    if curl -gs https://${whost}/confluent-api/ > /dev/null; then
+    if curl -s https://${1}/confluent-api/ > /dev/null; then
         return 0
     fi
     return 1
@@ -62,11 +58,7 @@ fetch_remote() {
     fi
     set_confluent_vars
     mkdir -p $(dirname $1)
-    whost=$confluent_mgr
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    curl -gf -sS $curlargs https://$whost/confluent-public/os/$confluent_profile/scripts/$1 > $1
+    curl -f -sS $curlargs https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/$1 > $1
     if [ $? != 0 ]; then echo $1 failed to download; return 1; fi
 }
 
@@ -173,11 +165,7 @@ run_remote_python() {
     echo Executing in $confluentscripttmpdir
     cd $confluentscripttmpdir
     mkdir -p $(dirname $1)
-    whost=$confluent_mgr
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    curl -gf -sS $curlargs https://$whost/confluent-public/os/$confluent_profile/scripts/$1 > $1
+    curl -f -sS $curlargs https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/$1 > $1
     if [ $? != 0 ]; then echo "'$*'" failed to download; return 1; fi
     confluentpython $*
     retcode=$?

confluent_osdeploy/el9-diskless/profiles/default/scripts/getinstalldisk

@@ -54,7 +54,7 @@ class DiskInfo(object):
 
     @property
     def priority(self):
-        if self.model.lower() in ('m.2 nvme 2-bay raid kit', 'thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
+        if self.model.lower() in ('thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
             return 0
         if 'imsm' in self.mdcontainer:
             return 1

confluent_osdeploy/el9-diskless/profiles/default/scripts/image2disk.py

@@ -11,8 +11,6 @@ import struct
 import sys
 import subprocess
 
-bootuuid = None
-
 def get_next_part_meta(img, imgsize):
     if img.tell() == imgsize:
         return None
@@ -55,13 +53,10 @@ class PartedRunner():
     def __init__(self, disk):
         self.disk = disk
 
-    def run(self, command, check=True):
+    def run(self, command):
         command = command.split()
         command = ['parted', '-a', 'optimal', '-s', self.disk] + command
-        if check:
-            return subprocess.check_output(command).decode('utf8')
-        else:
-            return subprocess.run(command, stdout=subprocess.PIPE).stdout.decode('utf8')
+        return subprocess.check_output(command).decode('utf8')
 
 def fixup(rootdir, vols):
     devbymount = {}
@@ -130,14 +125,9 @@ def fixup(rootdir, vols):
         sys.stdout.flush()
     for metafs in ('proc', 'sys', 'dev'):
         subprocess.check_call(['mount', '-o', 'bind', '/{}'.format(metafs), os.path.join(rootdir, metafs)])
-    if os.path.exists(os.path.join(rootdir, 'etc/lvm/devices/system.devices')):
-        os.remove(os.path.join(rootdir, 'etc/lvm/devices/system.devices'))
-    grubsyscfg = os.path.join(rootdir, 'etc/sysconfig/grub')
-    if not os.path.exists(grubsyscfg):
-        grubsyscfg = os.path.join(rootdir, 'etc/default/grub')
-    with open(grubsyscfg) as defgrubin:
+    with open(os.path.join(rootdir, 'etc/sysconfig/grub')) as defgrubin:
         defgrub = defgrubin.read().split('\n')
-    with open(grubsyscfg, 'w') as defgrubout:
+    with open(os.path.join(rootdir, 'etc/sysconfig/grub'), 'w') as defgrubout:
         for gline in defgrub:
             gline = gline.split()
             newline = []
@@ -146,34 +136,8 @@ def fixup(rootdir, vols):
                     continue
                 newline.append(ent)
             defgrubout.write(' '.join(newline) + '\n')
-    grubcfg = subprocess.check_output(['find', os.path.join(rootdir, 'boot'), '-name', 'grub.cfg']).decode('utf8').strip().replace(rootdir, '/').replace('//', '/')
-    grubcfg = grubcfg.split('\n')
-    if not grubcfg[-1]:
-        grubcfg = grubcfg[:-1]
-    if len(grubcfg) == 1:
-        grubcfg = grubcfg[0]
-    else:
-        for gcfg in grubcfg:
-            rgcfg = os.path.join(rootdir, gcfg[1:])  # gcfg has a leading / to get rid of
-            if os.stat(rgcfg).st_size > 256:
-                grubcfg = gcfg
-            else:
-                with open(rgcfg, 'r') as gin:
-                    tgrubcfg = gin.read()
-                tgrubcfg = tgrubcfg.split('\n')
-                if 'search --no-floppy --fs-uuid --set=dev' in tgrubcfg[0]:
-                    tgrubcfg[0] = 'search --no-floppy --fs-uuid --set=dev ' + bootuuid
-                with open(rgcfg, 'w') as gout:
-                    for gcline in tgrubcfg:
-                        gout.write(gcline)
-                        gout.write('\n')
-    try:
-        subprocess.check_call(['chroot', rootdir, 'grub2-mkconfig', '-o', grubcfg])
-    except Exception as e:
-        print(repr(e))
-        print(rootdir)
-        print(grubcfg)
-        time.sleep(86400)
+    grubcfg = subprocess.check_output(['find', os.path.join(rootdir, 'boot'), '-name', 'grub.cfg']).decode('utf8').strip().replace(rootdir, '/')
+    subprocess.check_call(['chroot', rootdir, 'grub2-mkconfig', '-o', grubcfg])
     newroot = None
     with open('/etc/shadow') as shadowin:
         shents = shadowin.read().split('\n')
@@ -220,7 +184,6 @@ def had_swap():
     return False
 
 def install_to_disk(imgpath):
-    global bootuuid
     lvmvols = {}
     deftotsize = 0
     mintotsize = 0
@@ -261,7 +224,7 @@ def install_to_disk(imgpath):
         instdisk = diskin.read()
     instdisk = '/dev/' + instdisk
     parted = PartedRunner(instdisk)
-    dinfo = parted.run('unit s print', check=False)
+    dinfo = parted.run('unit s print')
     dinfo = dinfo.split('\n')
     sectors = 0
     sectorsize = 0
@@ -403,14 +366,6 @@ def install_to_disk(imgpath):
                 sys.stdout.write('\x1b[1K\rDone writing {0}'.format(vol['mount']))
                 sys.stdout.write('\n')
                 sys.stdout.flush()
-                if vol['mount'] == '/boot':
-                    tbootuuid = subprocess.check_output(['blkid', vol['targetdisk']])
-                    if b'UUID="' in tbootuuid:
-                        bootuuid = tbootuuid.split(b'UUID="', 1)[1].split(b'"')[0].decode('utf8')
-
-
-
-
             subprocess.check_call(['umount', '/run/imginst/targ'])
         for vol in allvols:
             subprocess.check_call(['mount', vol['targetdisk'], '/run/imginst/targ/' + vol['mount']])
@@ -418,4 +373,4 @@ def install_to_disk(imgpath):
 
 
 if __name__ == '__main__':
-    install_to_disk(os.environ['mountsrc'])
+    install_to_disk(os.environ['mountsrc'])

confluent_osdeploy/el9-diskless/profiles/default/scripts/imageboot.sh

@@ -1,14 +1,10 @@
 . /lib/dracut-lib.sh
-confluent_whost=$confluent_mgr
-if [[ "$confluent_whost" == *:* ]]; then
-    confluent_whost="[$confluent_mgr]"
-fi
 mkdir -p /mnt/remoteimg /mnt/remote /mnt/overlay
 if [ "untethered" = "$(getarg confluent_imagemethod)" ]; then
     mount -t tmpfs untethered /mnt/remoteimg
-    curl https://$confluent_whost/confluent-public/os/$confluent_profile/rootimg.sfs -o /mnt/remoteimg/rootimg.sfs
+    curl https://$confluent_mgr/confluent-public/os/$confluent_profile/rootimg.sfs -o /mnt/remoteimg/rootimg.sfs
 else
-    confluent_urls="$confluent_urls https://$confluent_whost/confluent-public/os/$confluent_profile/rootimg.sfs"
+    confluent_urls="$confluent_urls https://$confluent_mgr/confluent-public/os/$confluent_profile/rootimg.sfs"
     /opt/confluent/bin/urlmount $confluent_urls /mnt/remoteimg
 fi
 /opt/confluent/bin/confluent_imginfo /mnt/remoteimg/rootimg.sfs > /tmp/rootimg.info
@@ -16,8 +12,8 @@ loopdev=$(losetup -f)
 export mountsrc=$loopdev
 losetup -r $loopdev /mnt/remoteimg/rootimg.sfs
 if grep '^Format: confluent_crypted' /tmp/rootimg.info > /dev/null; then
-    while ! curl -sf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" https://$confluent_whost/confluent-api/self/profileprivate/pending/rootimg.key > /tmp/rootimg.key; do
-        echo "Unable to retrieve private key from $confluent_mgr (verify that confluent can access /var/lib/confluent/private/os/$confluent_profile/pending/rootimg.key)"
+    while ! curl -sf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" https://$confluent_mgr/confluent-api/self/profileprivate/pending/rootimg.key > /tmp/rootimg.key; do
+        echo "Unable to retrieve private key from $confluent_mgr (verify that confluent can access /var/lib/confluent/private/$confluent_profile/pending/rootimg.key)"
         sleep 1
     done
     cipher=$(head -n 1 /tmp/rootimg.key)
@@ -107,15 +103,15 @@ echo 'Host *' >> $sshconf
 echo '    HostbasedAuthentication yes' >> $sshconf
 echo '    EnableSSHKeysign yes' >> $sshconf
 echo '    HostbasedKeyTypes *ed25519*' >> $sshconf
-curl -sf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" https://$confluent_whost/confluent-api/self/nodelist > /sysroot/etc/ssh/shosts.equiv
+curl -sf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" https://$confluent_mgr/confluent-api/self/nodelist > /sysroot/etc/ssh/shosts.equiv
 cp /sysroot/etc/ssh/shosts.equiv /sysroot/root/.shosts
 chmod 640 /sysroot/etc/ssh/*_key
 chroot /sysroot chgrp ssh_keys /etc/ssh/*_key
 cp /tls/*.pem /sysroot/etc/pki/ca-trust/source/anchors/
 chroot /sysroot/ update-ca-trust
-curl -sf https://$confluent_whost/confluent-public/os/$confluent_profile/scripts/onboot.service > /sysroot/etc/systemd/system/onboot.service
+curl -sf https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/onboot.service > /sysroot/etc/systemd/system/onboot.service
 mkdir -p /sysroot/opt/confluent/bin
-curl -sf https://$confluent_whost/confluent-public/os/$confluent_profile/scripts/onboot.sh > /sysroot/opt/confluent/bin/onboot.sh
+curl -sf https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/onboot.sh > /sysroot/opt/confluent/bin/onboot.sh
 chmod +x /sysroot/opt/confluent/bin/onboot.sh
 cp /opt/confluent/bin/apiclient /sysroot/opt/confluent/bin
 ln -s /etc/systemd/system/onboot.service /sysroot/etc/systemd/system/multi-user.target.wants/onboot.service
@@ -127,7 +123,5 @@ if grep installtodisk /proc/cmdline > /dev/null; then
 fi
 mv /lib/modules/$(uname -r) /lib/modules/$(uname -r)-ramfs
 ln -s /sysroot/lib/modules/$(uname -r) /lib/modules/
-mv /lib/firmware /lib/firmware-ramfs
-ln -s /sysroot/lib/firmware /lib/firmware
 kill $(grep -l ^/usr/lib/systemd/systemd-udevd  /proc/*/cmdline|cut -d/ -f 3)
 exec /opt/confluent/bin/start_root

confluent_osdeploy/el9-diskless/profiles/default/scripts/installimage

@@ -31,9 +31,6 @@ if [ ! -f /sysroot/tmp/installdisk ]; then
 fi
 lvm vgchange -a n
 udevadm control -e
-if [ -f /sysroot/etc/lvm/devices/system.devices ]; then
-    rm /sysroot/etc/lvm/devices/system.devices
-fi
 chroot /sysroot /usr/lib/systemd/systemd-udevd --daemon
 chroot /sysroot bash -c "source /etc/confluent/functions; run_remote_python image2disk.py"
 echo "Port 22" >> /etc/ssh/sshd_config

confluent_osdeploy/el9-diskless/profiles/default/scripts/onboot.sh

@@ -7,15 +7,8 @@
 
 nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
 confluent_apikey=$(cat /etc/confluent/confluent.apikey)
-v4meth=$(grep ^ipv4_method: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-if [ "$v4meth" = "null" -o -z "$v4meth" ]; then
-    confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-fi
-if [ -z "$confluent_mgr" ]; then
-    confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-fi
+confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-timedatectl set-timezone $(grep ^timezone: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 export nodename confluent_mgr confluent_profile
 . /etc/confluent/functions
 mkdir -p /var/log/confluent

confluent_osdeploy/el9-diskless/profiles/default/scripts/syncfileclient

@@ -1,5 +1,4 @@
-#!/usr/bin/python3
-import subprocess
+#!/usr/bin/python
 import importlib
 import tempfile
 import json
@@ -212,20 +211,7 @@ def synchronize():
     appendoncedir = tempfile.mkdtemp()
     try:
         ac = apiclient.HTTPSClient()
-        myips = []
-        ipaddrs = subprocess.check_output(['ip', '-br', 'a']).split(b'\n')
-        for line in ipaddrs:
-            isa = line.split()
-            if len(isa) < 3 or isa[1] != b'UP':
-                continue
-            for addr in isa[2:]:
-                if addr.startswith(b'fe80::') or addr.startswith(b'169.254'):
-                    continue
-                addr = addr.split(b'/')[0]
-                if not isinstance(addr, str):
-                    addr = addr.decode('utf8')
-                myips.append(addr)
-        data = json.dumps({'merge': tmpdir, 'appendonce': appendoncedir, 'myips': myips})
+        data = json.dumps({'merge': tmpdir, 'appendonce': appendoncedir})
         status, rsp = ac.grab_url_with_status('/confluent-api/self/remotesyncfiles', data)
         if status == 202:
             lastrsp = ''

confluent_osdeploy/esxi7/initramfs/bin/dcuiweasel

@@ -1,82 +1,13 @@
 #!/bin/sh
 # copernicus is hard coded, easier to script a fake sysfs
-if [ ! -f /var/run/vmware/show-esx-shell-login ]; then
-    chvt 1
-    sleep 1
-    chvt 2
-    /etc/init.d/ESXShell start
-fi
 uuid=$(vsish -e get /hardware/bios/dmiInfo|grep -A15 UUID|sed -e 's/.*://'|sed -e ':a;N;$!ba;s/\n//g' | sed -e 's/ *0x//g')
 uuid=${uuid:0:8}-${uuid:8:4}-${uuid:12:4}-${uuid:16:4}-${uuid:20:12}
-kargs=$(vsish -e get /system/bootCmdLine|grep "command line:")
-vlanid=""
-for karg in $kargs; do
-    if [ ${karg%=*} = "vlanid" ]; then
-        vlanid=${karg/*=}
-    fi
-done
-if [ ! -z "$vlanid" ]; then
-    echo $vlanid > /tmp/confluent.vlanid
-    localcli network  vswitch standard portgroup set -p "Management Network" -v $vlanid
-fi
 mkdir -p /sys/devices/virtual/dmi/id/
 echo $uuid > /sys/devices/virtual/dmi/id/product_uuid
 mkdir -p /etc/confluent
 localcli network firewall unload
 touch /etc/confluent/confluent.info
 begin=$(date +%s)
-localcli system secpolicy domain set -n appDom -l disabled
-personality=''
-for usb in /dev/disks/mpx.vmhba*; do 
-    if mdir -i $usb |grep CNFLNT_IDNT > /dev/null; then
-	personality=$usb
-	break
-    fi
-done
-if [ ! -z "$personality" ]; then
-    mkdir -p /tmp/confluentident
-    mcopy -i $personality ::* /tmp/confluentident/
-fi
-touch /etc/confluent/confluent.apikey
-if [ -e /tmp/confluentident/cnflnt.yml ]; then
-    cat /tls/*.pem >> /etc/confluent/ca.pem
-    deploysrvs=$(sed -n '/^deploy_servers:/,/^[^-]/p' /tmp/confluentident/cnflnt.yml |grep ^-|sed -e 's/^- //'|grep -v :)
-    nodename=$(grep ^nodename: /tmp/confluentident/cnflnt.yml|sed -e 's/nodename: //')
-    echo 'NODENAME: '$nodename > /etc/confluent/confluent.info
-    for deploysrv in $deploysrvs; do
-        echo 'MANAGER: '$deploysrv >> /etc/confluent/confluent.info
-    done
-    tcfg=$(mktemp)
-    sed -n '/^net_cfgs:/,/^[^- ]/{/^[^- ]/!p}' /tmp/confluentident/cnflnt.yml |sed -n '/^-/,/^-/{/^-/!p}'| sed -e 's/^[- ]*//'> $tcfg
-    autoconfigmethod=$(grep ^ipv4_method: $tcfg)
-    autoconfigmethod=${autoconfigmethod#ipv4_method: }
-    if [ "$autoconfigmethod" = "static" ]; then
-        v4addr=$(grep ^ipv4_address: $tcfg)
-        v4addr=${v4addr#ipv4_address: }
-        v4addr=${v4addr%/*}
-        v4gw=$(grep ^ipv4_gateway: $tcfg)
-        v4gw=${v4gw#ipv4_gateway: }
-        if [ "$v4gw" = "null" ]; then
-            v4gw=""
-        fi
-        v4nm=$(grep ipv4_netmask: $tcfg)
-        v4nm=${v4nm#ipv4_netmask: }
-        localcli network ip interface ipv4 set -i vmk0 -I $v4addr -N $v4nm -g $v4gw -t static
-        localcli network ip route ipv4 add -n default -g $v4gw
-    fi
-    hmackeyfile=$(mktemp)
-    echo -n $(grep ^apitoken: /tmp/confluentident/cnflnt.yml|awk '{print $2}') > $hmackeyfile
-    cd -
-    passfile=$(mktemp)
-    passcrypt=$(mktemp)
-    hmacfile=$(mktemp)
-    ln -s /opt/confluent/bin/clortho /opt/confluent/bin/genpasshmac
-    /opt/confluent/bin/genpasshmac $passfile $passcrypt $hmacfile $hmackeyfile
-    echo -n 'Registering new API key with deployment server: '
-    /opt/confluent/bin/apiclient -p $hmacfile /confluent-api/self/registerapikey $passcrypt
-    echo
-    cp $passfile /etc/confluent/confluent.apikey
-fi
 while ! grep NODENAME /etc/confluent/confluent.info; do
     echo "Searching for deployment service on local network..."
     /opt/confluent/bin/copernicus > /etc/confluent/confluent.info
@@ -94,21 +25,23 @@ while ! grep NODENAME /etc/confluent/confluent.info; do
     fi
 done
 node=$(grep NODENAME: /etc/confluent/confluent.info|head -n 1|awk '{print $2}')
-cat /tls/*.pem > /etc/confluent/ca.pem
-mgr=$(python /opt/confluent/bin/apiclient -c)
+mgr=$(grep MANAGER: /etc/confluent/confluent.info|head -n 1|awk '{print $2}')
+cp /opt/confluent/bin/clortho /clortho
+/clortho $node $mgr > /etc/confluent/confluent.apikey
 APIKEY=$(cat /etc/confluent/confluent.apikey)
-
-if [ -z "$APIKEY" ]; then
-    cp /opt/confluent/bin/clortho /clortho
-    (/clortho $node $mgr || /opt/confluent/bin/clortho $node $mgr) > /etc/confluent/confluent.apikey
-    APIKEY=$(cat /etc/confluent/confluent.apikey)
-fi
 while [ -z "$APIKEY" ]; do
+    if [ ! -f /var/run/vmware/show-esx-shell-login ]; then
+        chvt 1
+        sleep 1
+        chvt 2
+        /etc/init.d/ESXShell start
+    fi
     echo "Deployment server failed to grant node deployment token, retrying token retrieval"
     echo "A debug session has been made available on Alt-F1"
-    (/clortho $node $mgr || /opt/confluent/bin/clortho $node $mgr) > /etc/confluent/confluent.apikey
+    /clortho $node $mgr > /etc/confluent/confluent.apikey
     APIKEY=$(cat /etc/confluent/confluent.apikey)
 done
+cat /tls/*.pem > /etc/confluent/ca.pem
 /opt/confluent/bin/apiclient /confluent-api/self/deploycfg > /etc/confluent/confluent.deploycfg.new
 profile=$(grep ^profile: /etc/confluent/confluent.deploycfg.new | sed -e 's/^profile: //')
 /opt/confluent/bin/apiclient /confluent-public/os/$profile/kickstart > /etc/confluent/ks.cfg

confluent_osdeploy/esxi7/profiles/hypervisor/scripts/makeksnet

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 import re
 import subprocess
-import json
+
 uplinkmatch = re.compile('^\s*Uplinks:\s*(.*)')
 nodename = None
 for inf in open('/etc/confluent/confluent.info', 'r').read().split('\n'):
@@ -33,18 +33,6 @@ for info in vswinfo.split('\n'):
     upinfo = uplinkmatch.match(info)
     if upinfo:
         vmnic = upinfo.group(1)
-        if vmnic and 'vusb0' not in vmnic:
-            break
-try:
-    with open('/tmp/confluentident/cnflnt.jsn') as identin:
-        identcfg = json.load(identin)
-        ncfg = identcfg['net_cfgs'][0]
-        cfg['ipv4_method'] = ncfg['ipv4_method']
-        cfg['ipv4_address'] = ncfg['ipv4_address'].split('/')[0]
-        cfg['ipv4_netmask'] = ncfg['ipv4_netmask']
-        cfg['ipv4_gateway'] = ncfg['ipv4_gateway']
-except Exception:
-    pass
 netline = 'network --hostname={0} --bootproto={1}'.format(nodename, cfg['ipv4_method'])
 if vmnic:
     netline += ' --device={0}'.format(vmnic)
@@ -54,12 +42,5 @@ if cfg['ipv4_method'] == 'static':
         netline += ' --gateway={0}'.format(cfg['ipv4_gateway'])
     if cfg['nameservers']:
         netline += ' --nameserver={0}'.format(cfg['nameservers'])
-vlanid = None
-try:
-    with open('/tmp/confluent.vlanid', 'r') as vlanin:
-        vlanid = vlanin.read()
-except Exception:
-    pass
-if vlanid:
-    netline += ' --vlanid={0}'.format(vlanid)
 print(netline)
+    

confluent_osdeploy/genesis/profiles/default/ansible/onboot.d/README.txt

@@ -1,10 +1,6 @@
 Ansible playbooks ending in .yml or .yaml that are placed into this directory will be executed at the
 appropriate phase of the install process.
 
-Alternatively, plays may be placed in /var/lib/confluent/private/os/<profilename>/ansible/<directory>.
-This prevents public clients from being able to read the plays, which is not necessary for them to function,
-and may protect them from divulging material contained in the plays or associated roles.
-
 The 'hosts' may be omitted, and if included will be ignored, replaced with the host that is specifically
 requesting the playbooks be executed.
 

confluent_osdeploy/genesis/profiles/default/scripts/functions

@@ -1,4 +1,10 @@
 #!/bin/bash
+function test_mgr() {
+    if curl -s https://${1}/confluent-api/ > /dev/null; then
+        return 0
+    fi
+    return 1
+}
 
 function confluentpython() {
     if [ -x /usr/libexec/platform-python ]; then
@@ -16,9 +22,29 @@ function set_confluent_vars() {
     if [ -z "$nodename" ]; then
         nodename=$(grep ^NODENAME: /etc/confluent/confluent.info | awk '{print $2}')
     fi
-    confluent_mgr=$(confluentpython /opt/confluent/bin/apiclient -c)
-    if [[ "$confluent_mgr" = *":"* ]]; then
-        confluent_mgr="[$confluent_mgr]"
+    if [[ "$confluent_mgr" == *"%"* ]]; then
+        confluent_mgr=""
+    fi
+    if [ -z "$confluent_mgr" ]; then
+        confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg | sed -e 's/[^ ]*: //')
+        if ! test_mgr $confluent_mgr; then
+            confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg | sed -e 's/[^ ]*: //')
+            if [[ "$confluent_mgr" = *":"* ]]; then
+                confluent_mgr="[$confluent_mgr]"
+            fi
+        fi
+        if ! test_mgr $confluent_mgr; then
+            BESTMGRS=$(grep ^EXTMGRINFO: /etc/confluent/confluent.info | grep '|1$' | sed -e 's/EXTMGRINFO: //' -e 's/|.*//')
+            OKMGRS=$(grep ^EXTMGRINFO: /etc/confluent/confluent.info | grep '|0$' | sed -e 's/EXTMGRINFO: //' -e 's/|.*//')
+            for confluent_mgr in $BESTMGRS $OKMGRS; do
+                if [[ $confluent_mgr == *":"* ]]; then
+                    confluent_mgr="[$confluent_mgr]"
+                fi
+                if test_mgr $confluent_mgr; then
+                    break
+                fi
+            done
+        fi
     fi
     if [ -z "$confluent_profile" ]; then
         confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg | sed -e 's/[^ ]*: //')
@@ -26,13 +52,13 @@ function set_confluent_vars() {
 }
 
 fetch_remote() {
-    set_confluent_vars
-    apiclient=/opt/confluent/bin/apiclient
-    if [ -f /etc/confluent/apiclient ]; then
-        apiclient=/etc/confluent/apiclient
+    curlargs=""
+    if [ -f /etc/confluent/ca.pem ]; then
+        curlargs=" --cacert /etc/confluent/ca.pem"
     fi
+    set_confluent_vars
     mkdir -p $(dirname $1)
-    confluentpython $apiclient /confluent-public/os/$confluent_profile/scripts/$1 -o $1
+    curl -f -sS $curlargs https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/$1 > $1
     if [ $? != 0 ]; then echo $1 failed to download; return 1; fi
 }
 
@@ -130,13 +156,16 @@ run_remote() {
 run_remote_python() {
     echo
     set_confluent_vars
+    if [ -f /etc/confluent/ca.pem ]; then
+        curlargs=" --cacert /etc/confluent/ca.pem"
+    fi
     echo '---------------------------------------------------------------------------'
     echo Running python script "'$*'" from https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/
     confluentscripttmpdir=$(mktemp -d /tmp/confluentscripts.XXXXXXXXX)
     echo Executing in $confluentscripttmpdir
     cd $confluentscripttmpdir
     mkdir -p $(dirname $1)
-    confluentpython /opt/confluent/bin/apiclient /confluent-public/os/$confluent_profile/scripts/$1 -o $1
+    curl -f -sS $curlargs https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/$1 > $1
     if [ $? != 0 ]; then echo "'$*'" failed to download; return 1; fi
     confluentpython $*
     retcode=$?

confluent_osdeploy/genesis/profiles/default/scripts/syncfileclient

@@ -1,5 +1,4 @@
-#!/usr/bin/python3
-import subprocess
+#!/usr/bin/python
 import importlib
 import tempfile
 import json
@@ -212,20 +211,7 @@ def synchronize():
     appendoncedir = tempfile.mkdtemp()
     try:
         ac = apiclient.HTTPSClient()
-        myips = []
-        ipaddrs = subprocess.check_output(['ip', '-br', 'a']).split(b'\n')
-        for line in ipaddrs:
-            isa = line.split()
-            if len(isa) < 3 or isa[1] != b'UP':
-                continue
-            for addr in isa[2:]:
-                if addr.startswith(b'fe80::') or addr.startswith(b'169.254'):
-                    continue
-                addr = addr.split(b'/')[0]
-                if not isinstance(addr, str):
-                    addr = addr.decode('utf8')
-                myips.append(addr)
-        data = json.dumps({'merge': tmpdir, 'appendonce': appendoncedir, 'myips': myips})
+        data = json.dumps({'merge': tmpdir, 'appendonce': appendoncedir})
         status, rsp = ac.grab_url_with_status('/confluent-api/self/remotesyncfiles', data)
         if status == 202:
             lastrsp = ''

confluent_osdeploy/rhvh4/profiles/default/scripts/getinstalldisk

@@ -46,15 +46,10 @@ class DiskInfo(object):
                 self.driver = v.replace('"', '')
         if not self.driver and 'imsm' not in self.mdcontainer:
             raise Exception("No driver detected")
-        if os.path.exists('/sys/block/{0}/size'.format(self.name)):
-            with open('/sys/block/{0}/size'.format(self.name), 'r') as sizesrc:
-                self.size = int(sizesrc.read()) * 512
-        if int(self.size) < 536870912:
-            raise Exception("Device too small for install")
 
     @property
     def priority(self):
-        if self.model.lower() in ('m.2 nvme 2-bay raid kit', 'thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
+        if self.model.lower() in ('thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
             return 0
         if 'imsm' in self.mdcontainer:
             return 1

confluent_osdeploy/suse15-diskless/initramfs/lib/dracut/hooks/cmdline/10-confluentdiskless.sh

@@ -161,7 +161,7 @@ else
     echo -e "BOOTPROTO='static'\nSTARTMODE='auto'" >> /run/confluent/ifcfg-$ifname
     echo "IPADDR='$v4addr/$v4nm'" >> /run/confluent/ifcfg-$ifname
     if [ ! -z "$v4gw" ]; then
-        echo default $v4gw - $ifname > /run/confluent/ifroute-$ifname
+        echo defafult $v4gw - $ifname > /run/confluent/ifroute-$ifname
     fi
 fi
 

confluent_osdeploy/suse15-diskless/profiles/default/scripts/functions

@@ -1,10 +1,6 @@
 #!/bin/bash
 function test_mgr() {
-    whost=$1
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    if curl -gs https://${whost}/confluent-api/ > /dev/null; then
+    if curl -s https://${1}/confluent-api/ > /dev/null; then
         return 0
     fi
     return 1
@@ -62,11 +58,7 @@ fetch_remote() {
     fi
     set_confluent_vars
     mkdir -p $(dirname $1)
-    whost=$confluent_mgr
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    curl -gf -sS $curlargs https://$whost/confluent-public/os/$confluent_profile/scripts/$1 > $1
+    curl -f -sS $curlargs https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/$1 > $1
     if [ $? != 0 ]; then echo $1 failed to download; return 1; fi
 }
 
@@ -173,11 +165,7 @@ run_remote_python() {
     echo Executing in $confluentscripttmpdir
     cd $confluentscripttmpdir
     mkdir -p $(dirname $1)
-    whost=$confluent_mgr
-    if [[ "$whost" == *:* ]] && [[ "$whost" != *[* ]] ; then
-        whost="[$whost]"
-    fi
-    curl -gf -sS $curlargs https://$whost/confluent-public/os/$confluent_profile/scripts/$1 > $1
+    curl -f -sS $curlargs https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/$1 > $1
     if [ $? != 0 ]; then echo "'$*'" failed to download; return 1; fi
     confluentpython $*
     retcode=$?

confluent_osdeploy/suse15-diskless/profiles/default/scripts/onboot.sh

@@ -9,7 +9,6 @@ nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
 confluent_apikey=$(cat /etc/confluent/confluent.apikey)
 confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-timedatectl set-timezone $(grep ^timezone: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 export nodename confluent_mgr confluent_profile
 . /etc/confluent/functions
 mkdir -p /var/log/confluent

confluent_osdeploy/suse15-diskless/profiles/default/scripts/syncfileclient

@@ -1,286 +0,0 @@
-#!/usr/bin/python3
-import subprocess
-import importlib
-import tempfile
-import json
-import os
-import shutil
-import pwd
-import grp
-from importlib.machinery import SourceFileLoader
-try:
-    apiclient = SourceFileLoader('apiclient', '/opt/confluent/bin/apiclient').load_module()
-except FileNotFoundError:
-    apiclient = SourceFileLoader('apiclient', '/etc/confluent/apiclient').load_module()
-
-
-def partitionhostsline(line):
-    comment = ''
-    try:
-        cmdidx = line.index('#')
-        comment = line[cmdidx:]
-        line = line[:cmdidx].strip()
-    except ValueError:
-        pass
-    if not line:
-        return '', [], comment
-    ipaddr, names = line.split(maxsplit=1)
-    names = names.split()
-    return ipaddr, names, comment
-
-class HostMerger(object):
-    def __init__(self):
-        self.byip = {}
-        self.byname = {}
-        self.sourcelines = []
-        self.targlines = []
-
-    def read_source(self, sourcefile):
-        with open(sourcefile, 'r') as hfile:
-            self.sourcelines = hfile.read().split('\n')
-        while not self.sourcelines[-1]:
-            self.sourcelines = self.sourcelines[:-1]
-        for x in range(len(self.sourcelines)):
-            line = self.sourcelines[x]
-            currip, names, comment = partitionhostsline(line)
-            if currip:
-                self.byip[currip] = x
-            for name in names:
-                self.byname[name] = x
-
-    def read_target(self, targetfile):
-        with open(targetfile, 'r') as hfile:
-            lines = hfile.read().split('\n')
-            if not lines[-1]:
-                lines = lines[:-1]
-            for y in range(len(lines)):
-                line = lines[y]
-                currip, names, comment = partitionhostsline(line)
-                if currip in self.byip:
-                    x = self.byip[currip]
-                    if self.sourcelines[x] is None:
-                        # have already consumed this enntry
-                        continue
-                    self.targlines.append(self.sourcelines[x])
-                    self.sourcelines[x] = None
-                    continue
-                for name in names:
-                    if name in self.byname:
-                        x = self.byname[name]
-                        if self.sourcelines[x] is None:
-                            break
-                        self.targlines.append(self.sourcelines[x])
-                        self.sourcelines[x] = None
-                        break
-                else:
-                    self.targlines.append(line)
-
-    def write_out(self, targetfile):
-        while not self.targlines[-1]:
-            self.targlines = self.targlines[:-1]
-            if not self.targlines:
-                break
-        while not self.sourcelines[-1]:
-            self.sourcelines = self.sourcelines[:-1]
-            if not self.sourcelines:
-                break
-        with open(targetfile, 'w') as hosts:
-            for line in self.targlines:
-                hosts.write(line + '\n')
-            for line in self.sourcelines:
-                if line is not None:
-                    hosts.write(line + '\n')
-
-
-class CredMerger:
-    def __init__(self):
-        try:
-            with open('/etc/login.defs', 'r') as ldefs:
-                defs = ldefs.read().split('\n')
-        except FileNotFoundError:
-            defs = []
-        lkup = {}
-        self.discardnames = {}
-        self.shadowednames = {}
-        for line in defs:
-            try:
-                line = line[:line.index('#')]
-            except ValueError:
-                pass
-            keyval = line.split()
-            if len(keyval) < 2:
-                continue
-            lkup[keyval[0]] = keyval[1]
-        self.uidmin = int(lkup.get('UID_MIN', 1000))
-        self.uidmax = int(lkup.get('UID_MAX', 60000))
-        self.gidmin = int(lkup.get('GID_MIN', 1000))
-        self.gidmax = int(lkup.get('GID_MAX', 60000))
-        self.shadowlines = None
-
-    def read_passwd(self, source, targfile=False):
-        self.read_generic(source, self.uidmin, self.uidmax, targfile)
-
-    def read_group(self, source, targfile=False):
-        self.read_generic(source, self.gidmin, self.gidmax, targfile)
-
-    def read_generic(self, source, minid, maxid, targfile):
-        if targfile:
-            self.targdata = []
-        else:
-            self.sourcedata = []
-        with open(source, 'r') as inputfile:
-            for line in inputfile.read().split('\n'):
-                try:
-                    name, _, uid, _ = line.split(':', 3)
-                    uid = int(uid)
-                except ValueError:
-                    continue
-                if targfile:
-                    if uid < minid or uid > maxid:
-                        self.targdata.append(line)
-                    else:
-                        self.discardnames[name] = 1
-                else:
-                    if name[0] in ('+', '#', '@'):
-                        self.sourcedata.append(line)
-                    elif uid >= minid and uid <= maxid:
-                        self.sourcedata.append(line)
-
-    def read_shadow(self, source):
-        self.shadowlines = []
-        try:
-            with open(source, 'r') as inshadow:
-                for line in inshadow.read().split('\n'):
-                    try:
-                        name, _ = line.split(':' , 1)
-                    except ValueError:
-                        continue
-                    if name in self.discardnames:
-                        continue
-                    self.shadowednames[name] = 1
-                    self.shadowlines.append(line)
-        except FileNotFoundError:
-            return
-
-    def write_out(self, outfile):
-        with open(outfile, 'w') as targ:
-            for line in self.targdata:
-                targ.write(line + '\n')
-            for line in self.sourcedata:
-                targ.write(line + '\n')
-        if outfile == '/etc/passwd':
-            if self.shadowlines is None:
-                self.read_shadow('/etc/shadow')
-            with open('/etc/shadow', 'w') as shadout:
-                for line in self.shadowlines:
-                    shadout.write(line + '\n')
-                for line in self.sourcedata:
-                    name, _ = line.split(':', 1)
-                    if name[0] in ('+', '#', '@'):
-                        continue
-                    if name in self.shadowednames:
-                        continue
-                    shadout.write(name + ':!:::::::\n')
-        if outfile == '/etc/group':
-            if self.shadowlines is None:
-                self.read_shadow('/etc/gshadow')
-            with open('/etc/gshadow', 'w') as shadout:
-                for line in self.shadowlines:
-                    shadout.write(line + '\n')
-                for line in self.sourcedata:
-                    name, _ = line.split(':' , 1)
-                    if name in self.shadowednames:
-                        continue
-                    shadout.write(name + ':!::\n')
-
-def appendonce(basepath, filename):
-    with open(filename, 'rb') as filehdl:
-        thedata = filehdl.read()
-    targname = filename.replace(basepath, '')
-    try:
-        with open(targname, 'rb') as filehdl:
-            targdata = filehdl.read()
-    except IOError:
-        targdata = b''
-    if thedata in targdata:
-        return
-    with open(targname, 'ab') as targhdl:
-        targhdl.write(thedata)
-
-def synchronize():
-    tmpdir = tempfile.mkdtemp()
-    appendoncedir = tempfile.mkdtemp()
-    try:
-        ac = apiclient.HTTPSClient()
-        myips = []
-        ipaddrs = subprocess.check_output(['ip', '-br', 'a']).split(b'\n')
-        for line in ipaddrs:
-            isa = line.split()
-            if len(isa) < 3 or isa[1] != b'UP':
-                continue
-            for addr in isa[2:]:
-                if addr.startswith(b'fe80::') or addr.startswith(b'169.254'):
-                    continue
-                addr = addr.split(b'/')[0]
-                if not isinstance(addr, str):
-                    addr = addr.decode('utf8')
-                myips.append(addr)
-        data = json.dumps({'merge': tmpdir, 'appendonce': appendoncedir, 'myips': myips})
-        status, rsp = ac.grab_url_with_status('/confluent-api/self/remotesyncfiles', data)
-        if status == 202:
-            lastrsp = ''
-            while status != 204:
-                status, rsp = ac.grab_url_with_status('/confluent-api/self/remotesyncfiles')
-                if not isinstance(rsp, str):
-                    rsp = rsp.decode('utf8')
-                if status == 200:
-                    lastrsp = rsp
-            pendpasswd = os.path.join(tmpdir, 'etc/passwd')
-            if os.path.exists(pendpasswd):
-                cm = CredMerger()
-                cm.read_passwd(pendpasswd, targfile=False)
-                cm.read_passwd('/etc/passwd', targfile=True)
-                cm.write_out('/etc/passwd')
-            pendgroup = os.path.join(tmpdir, 'etc/group')
-            if os.path.exists(pendgroup):
-                cm = CredMerger()
-                cm.read_group(pendgroup, targfile=False)
-                cm.read_group('/etc/group', targfile=True)
-                cm.write_out('/etc/group')
-            pendhosts = os.path.join(tmpdir, 'etc/hosts')
-            if os.path.exists(pendhosts):
-                cm = HostMerger()
-                cm.read_source(pendhosts)
-                cm.read_target('/etc/hosts')
-                cm.write_out('/etc/hosts')
-            for dirn in os.walk(appendoncedir):
-                for filen in dirn[2]:
-                    appendonce(appendoncedir, os.path.join(dirn[0], filen))
-            if lastrsp:
-                lastrsp = json.loads(lastrsp)
-                opts = lastrsp.get('options', {})
-                for fname in opts:
-                    uid = -1
-                    gid = -1
-                    for opt in opts[fname]:
-                        if opt == 'owner':
-                            try:
-                                uid = pwd.getpwnam(opts[fname][opt]['name']).pw_uid
-                            except KeyError:
-                                uid = opts[fname][opt]['id']
-                        elif opt == 'group':
-                            try:
-                                gid = grp.getgrnam(opts[fname][opt]['name']).gr_gid
-                            except KeyError:
-                                gid = opts[fname][opt]['id']
-                        elif opt == 'permissions':
-                            os.chmod(fname, int(opts[fname][opt], 8))
-                    if uid != -1 or gid != -1:
-                        os.chown(fname, uid, gid)
-    finally:
-        shutil.rmtree(tmpdir)
-        shutil.rmtree(appendoncedir)
-
-
-if __name__ == '__main__':
-    synchronize()

confluent_osdeploy/suse15-diskless/profiles/default/syncfiles

@@ -1,29 +0,0 @@
-# It is advised to avoid /var/lib/confluent/public as a source for syncing.  /var/lib/confluent/public
-# is served without authentication and thus any sensitive content would be a risk. If wanting to host
-# syncfiles on a common share, it is suggested to have /var/lib/confluent be the share and use some other
-# subdirectory other than public.
-#
-# Syncing is performed as the 'confluent' user, so all source files must be accessible by the confluent user.
-#
-# This file lists files to synchronize or merge to the deployed systems from the deployment server
-# To specify taking /some/path/hosts on the deployment server and duplicating it to /etc/hosts:
-# Note particularly the use of '->' to delineate source from target.
-# /some/path/hosts -> /etc/hosts
-
-# If wanting to simply use the same path for source and destinaiton, the -> may be skipped:
-# /etc/hosts
-
-# More function is available, for example to limit the entry to run only on n1 through n8, and to set
-# owner, group, and permissions in octal notation:
-# /example/source -> n1-n8:/etc/target (owner=root,group=root,permissions=600)
-
-# Entries under APPENDONCE: will be added to specified target, only if the target does not already
-# contain the data in the source already in its entirety. This allows append in a fashion that
-# is friendly to being run repeatedly
-
-# Entries under MERGE: will attempt to be intelligently merged. This supports /etc/group and /etc/passwd
-# Any supporting entries in /etc/shadow or /etc/gshadow are added automatically, with password disabled
-# It also will not inject 'system' ids (under 1,000 usually) as those tend to be local and rpm managed.
-MERGE:
-# /etc/passwd
-# /etc/group

confluent_osdeploy/suse15/initramfs/opt/confluent/bin/suseagent

@@ -77,12 +77,10 @@ if [ "$textconsole" = "true" ] && ! grep console= /proc/cmdline > /dev/null && [
 	sed -e s'/$/ 'console=${autocons#*/dev/}/ /proc/cmdline > /etc/fakecmdline
 	mount -o bind /etc/fakecmdline /proc/cmdline
 	echo "ConsoleDevice: ${autocons%,*}" >> /etc/linuxrc.d/01-confluent
-	echo "Textmode: 1" >> /etc/linuxrc.d/01-confluent
 fi
 
 tz=$(grep timezone: /etc/confluent/confluent.deploycfg | awk '{print $2}')
 echo "<timezone>${tz}</timezone>" > /tmp/timezone
-echo "${tz}" > /tmp/timezone.txt
 autoconfigmethod=$(grep ipv4_method /etc/confluent/confluent.deploycfg)
 autoconfigmethod=${autoconfigmethod#ipv4_method: }
 if [ "$autoconfigmethod" = "dhcp" ]; then

confluent_osdeploy/suse15/profiles/hpc/ansible/firstboot.d/README.txt

@@ -1,10 +1,6 @@
 Ansible playbooks ending in .yml or .yaml that are placed into this directory will be executed at the
 appropriate phase of the install process.
 
-Alternatively, plays may be placed in /var/lib/confluent/private/os/<profilename>/ansible/<directory>.
-This prevents public clients from being able to read the plays, which is not necessary for them to function,
-and may protect them from divulging material contained in the plays or associated roles.
-
 The 'hosts' may be omitted, and if included will be ignored, replaced with the host that is specifically
 requesting the playbooks be executed.
 

confluent_osdeploy/suse15/profiles/hpc/ansible/post.d/README.txt

@@ -1,10 +1,6 @@
 Ansible playbooks ending in .yml or .yaml that are placed into this directory will be executed at the
 appropriate phase of the install process.
 
-Alternatively, plays may be placed in /var/lib/confluent/private/os/<profilename>/ansible/<directory>.
-This prevents public clients from being able to read the plays, which is not necessary for them to function,
-and may protect them from divulging material contained in the plays or associated roles.
-
 The 'hosts' may be omitted, and if included will be ignored, replaced with the host that is specifically
 requesting the playbooks be executed.
 

confluent_osdeploy/suse15/profiles/hpc/autoyast

@@ -8,7 +8,7 @@ dynamic behavior and replace with static configuration.
 <profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
     <timezone>
       <hwclock>UTC</hwclock>
-      <timezone>%%TIMEZONE%%</timezone>
+      <!--INSERT:/tmp/timezone-->
     </timezone>
     <general>
       <self_update config:type="boolean">false</self_update>
@@ -16,6 +16,7 @@ dynamic behavior and replace with static configuration.
 	      <confirm config:type="boolean">false</confirm>
       </mode>
     </general>
+    %%IFSLE%%
     <add-on>
       <add_on_products config:type="list">
         <listentry><media_url/><!--INSERT:/tmp/pkgurl--><product>sle-module-basesystem</product><product_dir>/Module-Basesystem</product_dir></listentry>
@@ -26,11 +27,14 @@ dynamic behavior and replace with static configuration.
 	      <listentry><media_url/><!--INSERT:/tmp/pkgurl--><product>Legacy-Module</product><product_dir>/Module-Legacy</product_dir></listentry>
       </add_on_products>
     </add-on>
+    %%ENDIFSLE%%
     <!--INSERT:/tmp/bootloader.xml-->
     <software>
+       %%IFSLE%%
        <products config:type="list">
           <product>SLE_HPC</product>
       </products>
+       %%ENDIFSLE%%
       <patterns config:type="list">
         <pattern>base</pattern>
       </patterns>

confluent_osdeploy/suse15/profiles/hpc/autoyast.leap

@@ -1,132 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE profile>
-<!--
-This autoyast file will be processed by pre.sh before applying. See pre.sh for
-info on modifying its behavior, and also search and replace '%%' to remove
-dynamic behavior and replace with static configuration.
---> 
-<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns">
-    <timezone>
-      <hwclock>UTC</hwclock>
-      <timezone>%%TIMEZONE%%</timezone>
-    </timezone>
-    <general>
-      <self_update config:type="boolean">false</self_update>
-      <mode>
-	      <confirm config:type="boolean">false</confirm>
-      </mode>
-    </general>
-    <!--INSERT:/tmp/bootloader.xml-->
-    <software>
-      <patterns config:type="list">
-        <pattern>base</pattern>
-      </patterns>
-      <packages config:type="list">
-	<package>openssh</package>
-	<package>iputils</package>
-        <package>python3</package>
-        <package>openssl</package>
-        <package>chrony</package>
-        <package>rsync</package>
-        <package>screen</package>
-        <package>vim</package>
-        <package>binutils</package>
-        <package>pciutils</package>
-        <package>usbutils</package>
-        <package>nfs-client</package>
-        <package>ethtool</package>
-      </packages>
-    </software>
-  <partitioning config:type="list">
-	  <drive>
-		  <device>%%INSTDISK%%</device>
-		  <initialize config:type="boolean">true</initialize>
-		  <use>all</use>
-                  <partitions config:type="list">
-                         <partition>
-                                 <filesystem config:type="symbol">xfs</filesystem>
-                                 <mount>/</mount>
-                                 <size>max</size>
-                         </partition>
-                         <partition>
-                                 <mount>swap</mount>
-                                 <size>auto</size>
-                         </partition>
-                         <partition>
-                                 <mount>/boot</mount>
-                                 <size>500M</size>
-                         </partition>
-                 </partitions>
-          </drive>
- </partitioning>
-    <users config:type="list">
-      <user>
-        <username>root</username>
-        <user_password>%%ROOTPASSWORD%%</user_password>
-        <encrypted config:type="boolean">true</encrypted>
-	<!--INSERT:/tmp/rootkeys.xml-->
-      </user>
-    </users>
-    <networking>
-	    <dns>
-		    <hostname>%%NODENAME%%</hostname>
-            </dns>
-	    <keep_install_network config:type="boolean">true</keep_install_network>
-    </networking>
-    <services-manager>
-	    <services>
-		    <enable config:type="list">
-			    <service>sshd</service>
-			</enable>
-		</services>
-	</services-manager>
-    <scripts>
-         <pre-scripts config:type="list">
-        <script>
-          <filename>preinstall.sh</filename>
-          <source>
-<![CDATA[
-#!/bin/sh
-confluent_mgr=$(grep ^deploy_server /etc/confluent/confluent.deploycfg|awk '{print $2}')
-confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|sed -e 's/^profile: //')
-proto=$(grep ^protocol: /etc/confluent/confluent.deploycfg |awk '{print $2}')
-curl $proto://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/pre.sh > /tmp/pre.sh
-. /tmp/pre.sh
-]]>
-          </source>
-        </script>
-      </pre-scripts>
-         <chroot-scripts config:type="list">
-        <script>
-          <filename>chroot.sh</filename>
-          <source>
-<![CDATA[
-#!/bin/sh
-confluent_mgr=$(grep ^deploy_server /etc/confluent/confluent.deploycfg|awk '{print $2}')
-confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|sed -e 's/^profile: //')
-proto=$(grep ^protocol: /etc/confluent/confluent.deploycfg |awk '{print $2}')
-curl $proto://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/prechroot.sh > /tmp/prechroot.sh
-. /tmp/prechroot.sh
-curl -f $proto://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/firstboot.sh > /mnt/etc/confluent/firstboot.sh
-curl -f $proto://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/post.sh > /mnt/etc/confluent/post.sh
-chmod +x /mnt/etc/confluent/firstboot.sh
-chmod +x /mnt/etc/confluent/post.sh
-cp /mnt/etc/confluent/post.sh /mnt/var/adm/autoinstall/scripts/
-]]>
-          </source>
-        </script>
-        <script>
-          <chrooted config:type="boolean">true</chrooted>
-          <filename>post.sh</filename>
-          <location>file:///etc/confluent/post.sh</location>
-        </script>
-      </chroot-scripts>
-      <init-scripts config:type="list">
-        <script>
-          <filename>firstboot.sh</filename>
-          <location>file:///etc/confluent/firstboot.sh</location>
-        </script>
-     </init-scripts> 
-
-    </scripts>
-</profile>

confluent_osdeploy/suse15/profiles/hpc/initprofile.sh

@@ -17,7 +17,7 @@ ln -s $1/boot/x86_64/loader/initrd $2/boot/initramfs/distribution && \
 mkdir -p $2/boot/efi/boot && \
 ln -s $1/EFI/BOOT/bootx64.efi $1/EFI/BOOT/grub.efi $2/boot/efi/boot/
 if [[ $profile =~ ^sle.* ]]; then
-	ln -s autoyast.sle $2/autoyast
+	sed -i 's/%%IFSLE%%//;s/%%ENDIFSLE%%//' $2/autoyast
 else
-	ln -s autoyast.leap $2/autoyast
+	sed -i '/%%IFSLE%%/,/%%ENDIFSLE%%/d' $2/autoyast
 fi