Draft onyx module

Beginnings of Mellanox Onyx support
2026-09-29 08:41:00 +00:00 · 2020-04-10 16:49:51 -04:00
251 changed files with 987 additions and 13835 deletions
@@ -1,7 +1,4 @@
 *.pyc
 .*.
 confluent_client/man/man*
-.vscode
 .*.sw*
-.sw*
-.idea/*
@@ -88,18 +88,15 @@ while fullline:
    for line in fullline.split('\n'):
        if not line:
            continue
-        if ':' not in line:
+        if ': ' not in line:
            line = 'UNKNOWN: ' + line
        if options.log:
-            node, output = line.split(':', 1)
-            output = output.lstrip()
+            node, output = line.split(': ', 1)
            currlog = options.log.format(node=node, nodename=node)
            with open(currlog, mode='a')  as log:
                log.write(output + '\n')
            continue
-        node, output = line.split(':', 1)
-        output = output.lstrip()
-        grouped.add_line(node, output)
+        grouped.add_line(*line.split(': ', 1))
        if options.watch:
            if not holdoff:
                holdoff = os.times()[4] + 0.250
@@ -292,8 +292,6 @@ def rcompleter(text, state):


 def parse_command(command):
-    if isinstance(command, list):
-        return command
    try:
        args = shlex.split(command, posix=True)
    except ValueError as ve:
@@ -373,7 +371,7 @@ def do_command(command, server):
    if argv[0] == 'exit':
        if os.environ.get('TERM', '') not in ('linux'):
            sys.stdout.write('\x1b]0;\x07')
-        raise BailOut()
+        raise Bailout()
    elif argv[0] in ('help', '?'):
        return print_help()
    elif argv[0] == 'cd':
@@ -914,7 +912,8 @@ def main():
        do_command("start /nodes/%s/console/session" % session_node, netserver)
        doexit = True
    elif shellargs:
-        do_command(shellargs, netserver)
+        command = " ".join(shellargs)
+        do_command(command, netserver)
        quitconfetty(fullexit=True, fixterm=False)

    powerstate = None
@@ -948,8 +947,6 @@ def main():
                            clearpowermessage = False
                        try:
                            sys.stdout.write(data)
-                        except UnicodeEncodeError:
-                            sys.stdout.buffer.write(data.encode('utf8'))
                        except IOError:  # Some times circumstances are bad
                            # resort to byte at a time...
                            for d in data:
@@ -960,13 +957,7 @@ def main():
                            # don't bother churning if minute does not change
                            laststate['showtime'] = now
                            updatestatus()
-                        try:
-                            sys.stdout.flush()
-                        except Exception:
-                            # EWOULDBLOCK causes this to raise, ignore
-                            # this scenario comfortable that it
-                            # will come out soon enough
-                            pass
+                        sys.stdout.flush()
                    else:
                        deadline = 5
                        connected = False
@@ -1022,13 +1013,6 @@ if __name__ == '__main__':
        main()
    except BailOut as e:
        errcode = e.errorcode
-    except Exception as e:
-        import traceback
-        try:
-            quitconfetty()
-        except Exception:
-            pass
-        traceback.print_exc()
    finally:
        if deadline and os.times()[4] < deadline:
            sys.stderr.write('[Exited early, hit enter to continue]')
@@ -1,61 +1,19 @@
-#!/usr/bin/python
+#!/bin/sh
 # This will take a given directory and make a 'big floppy image'
 # out of it, suitable for nodemedia upload.

-import fcntl
-import glob
-import os
-import subprocess
-import sys
-
-def create_image(directory, image, label=None):
-    ents = 0
-    datasz = 512
-    for dir in os.walk(sys.argv[1]):
-        ents += 1
-        for filen in dir[2]:
-            ents += 1
-            filename = os.path.join(dir[0], filen)
-            currsz = os.path.getsize(filename)
-            # assuming up to 65k cluster
-            currsz = (currsz // 512 +1) * 512
-            datasz += currsz
-    datasz += ents * 32768
-    datasz = datasz // 512 + 1
-    with open(image, 'wb') as imgfile:
-        imgfile.seek(datasz * 512 - 1)
-        imgfile.write(b'\x00')
-    if label:
-        subprocess.check_call(['mformat', '-i', image, '-v', label,
-                               '-r', '16', '-d', '1', '-t', str(datasz),
-                               '-s', '1','-h', '1', '::'])
-    else:
-        subprocess.check_call(['mformat', '-i', image, '-r', '16', '-d', '1', '-t',
-                                str(datasz), '-s', '1','-h', '1', '::'])
-    # 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
-    # unlock between calls to mtools
-    with open(image, 'rb') as imgfile:
-        fcntl.flock(imgfile.fileno(), fcntl.LOCK_SH)
-        fcntl.flock(imgfile.fileno(), fcntl.LOCK_UN)
-    cpycmd = ['mcopy', '-i', image, '-s']
-    cpycmd.extend(glob.glob('{0}/*'.format(directory)))
-    cpycmd.append('::')
-    subprocess.check_call(cpycmd)
-    # though not necessary for us, make sure dir2img doesn't have a lingering
-    # flock from mcopy for any subsequent commands
-    with open(image, 'rb') as imgfile:
-        fcntl.flock(imgfile.fileno(), fcntl.LOCK_SH)
-        fcntl.flock(imgfile.fileno(), fcntl.LOCK_UN)
-
-
-if __name__ == '__main__':
-    if len(sys.argv) < 3:
-        sys.stderr.write("Usage: {0} <directory> <imagefile>".format(
-            sys.argv[0]))
-        sys.exit(1)
-    label = None
-    if len(sys.argv) > 3:
-        label = sys.argv[3]
-    create_image(sys.argv[1], sys.argv[2], label)
+if [ -z "$1" -o -z "$2" ]; then
+        echo "Usage: $0 <directory> <imagefile>"
+        exit 1
+fi
+# Get the needed payload side
+SIZE=$(du -sB 512 $1|awk '{print $1}')
+ENTRIES=$(find $1 |wc -l)
+# Also, each file and directory has overhead, pad size by 32kb per file,
+# which should be overkill but other values proved to be inadequate
+# A deeper understanding of VFAT would probably allow for more precise value
+SIZE=$((SIZE + ENTRIES * 64))
+dd if=/dev/zero of=$2 bs=512 count=$SIZE
+# Make a big single sided floppy with many many tracks, saves on complex math
+mformat -i $2 -d 1 -t $SIZE -s 1 -h 1 ::
+mcopy -i $2 -s $1/* ::
@@ -134,10 +134,9 @@ def _assign_value():
    assignment[key] = value


-def parse_config_line(arguments, single=False):
+def parse_config_line(arguments):
    global setmode, printallbmc, forceset, key, value, needval, candidate, path, attrib
-    for pidx in range(0, len(arguments)):
-        param = arguments[pidx]
+    for param in arguments:
        if param == 'show':
            continue  # forgive muscle memory of pasu users
        if param == 'set':
@@ -147,12 +146,7 @@ def parse_config_line(arguments, single=False):
        if needval:
            key = needval
            needval = None
-            if single:
-                value = ' '.join(arguments[pidx:])
-                _assign_value()
-                break
-            else:
-                value = param
+            value = param
            _assign_value()
            continue
        if '=' in param or param[-1] == ':' or forceset:
@@ -221,7 +215,7 @@ if options.batch:
            pass
        argset = argset.strip()
        if argset:
-            parse_config_line(shlex.split(argset), single=True)
+            parse_config_line(shlex.split(argset))
        argset = argfile.readline()
 else:
    parse_config_line(args[1:])
@@ -278,6 +272,7 @@ if setmode:
            rcode |= client.printerror(fr)
            for node in fr.get('databynode', []):
                r = fr['databynode'][node]
+                rcode |= client.printerror(r, node)
                if 'value' not in r:
                    continue
                keyval = r['value']
@@ -1,141 +0,0 @@
-#!/usr/bin/python3
-
-
-import argparse
-import os
-import sys
-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
-
-def cleararm(nr, cli):
-    nodes = set([])
-    for rsp in cli.read('/noderange/{0}/attributes/current'.format(nr)):
-        for node in rsp.get('databynode', {}):
-            nodeinfo = rsp['databynode'][node]
-            for attr in nodeinfo:
-                if attr == 'deployment.apiarmed':
-                    curr = nodeinfo[attr].get('value', '')
-                    if curr == 'continuous':
-                        nodes.add(node)
-    noderange = nr
-    if nodes:
-        noderange += ',-({0})'.format(','.join(nodes))
-    for rsp in cli.update('/noderange/{0}/attributes/current'.format(noderange),
-                          {'deployment.apiarmed': ''}):
-        pass
-
-
-def armonce(nr, cli):
-    nodes = set([])
-    for rsp in cli.read('/noderange/{0}/attributes/current'.format(nr)):
-        for node in rsp.get('databynode', {}):
-            nodeinfo = rsp['databynode'][node]
-            for attr in nodeinfo:
-                if attr == 'deployment.apiarmed':
-                    curr = nodeinfo[attr].get('value', '')
-                    if curr == 'continuous':
-                        nodes.add(node)
-    noderange = nr
-    if nodes:
-        noderange += ',-({0})'.format(','.join(nodes))
-    for rsp in cli.update('/noderange/{0}/attributes/current'.format(noderange),
-                          {'deployment.apiarmed': 'once'}):
-        pass
-
-
-def setpending(nr, profile, cli):
-    args = {'deployment.pendingprofile': profile}
-    if not profile.startswith('genesis-'):
-        args['deployment.stagedprofile'] = ''
-        args['deployment.profile'] = ''
-    for rsp in cli.update('/noderange/{0}/attributes/current'.format(nr),
-                          args):
-        pass
-
-
-def clearpending(nr, cli):
-    for rsp in cli.update('/noderange/{0}/attributes/current'.format(nr),
-                          {'deployment.pendingprofile': ''}):
-        pass
-
-def main(args):
-    ap = argparse.ArgumentParser(description='Deploy OS to nodes')
-    ap.add_argument('-c', '--clear', help='Clear any pending deployment action', action='store_true')
-    ap.add_argument('-n', '--network', help='Initiate deployment over PXE/HTTP', action='store_true')
-    ap.add_argument('-p', '--prepareonly', help='Prepare only, skip any interaction with a BMC associated with this deployment action', action='store_true')
-    ap.add_argument('-m', '--maxnodes', help='Specifiy a maximum nodes to be deployed')
-    ap.add_argument('noderange', help='Set of nodes to deploy')
-    ap.add_argument('profile', nargs='?', help='Profile name to deploy')
-    args, extra = ap.parse_known_args(args)
-    if args.profile is None and len(extra) == 1:
-        args.profile = extra[0]
-        extra = extra[1:]
-    if args.profile and not args.network:
-        sys.stderr.write('-n is a required argument currently to perform an install, optionally with -p\n')
-        return 1
-    if not args.profile and args.network:
-        sys.stderr.write('Both noderange and a profile name are required arguments to request a network deployment\n')
-        return 1
-    if extra:
-        sys.stderr.write('Unrecognized arguments: ' + repr(extra) + '\n')
-    c = client.Command()
-    c.stop_if_noderange_over(args.noderange, args.maxnodes)
-    if args.clear:
-        cleararm(args.noderange, c)
-        clearpending(args.noderange, c)
-    elif args.profile:
-        armonce(args.noderange, c)
-        setpending(args.noderange, args.profile, c)
-    else:
-        databynode = {}
-        for r in c.read('/noderange/{0}/attributes/current'.format(args.noderange)):
-            dbn = r.get('databynode', {})
-            for node in dbn:
-                if node not in databynode:
-                    databynode[node] = {}
-                for attr in dbn[node]:
-                    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', '')
-            if profile:
-                profile = 'pending: {}'.format(profile)
-            else:
-                profile = databynode[node].get('deployment.stagedprofile', '')
-                if profile:
-                    profile = 'staged: {}'.format(profile)
-                else:
-                    profile = databynode[node].get('deployment.profile', '')
-                    if profile:
-                        profile = 'completed: {}'.format(profile)
-                    else:
-                        profile= 'No profile pending or applied'
-            armed = databynode[node].get('deployment.apiarmed', '')
-            if armed in ('once', 'continuous'):
-                armed = ' (node authentication armed)'
-            else:
-                armed = ''
-            print('{0}: {1}{2}'.format(node, profile, armed))
-        sys.exit(0)
-    errnodes = set([])
-    if args.network and not args.prepareonly:
-        rc = c.simple_noderange_command(args.noderange, '/boot/nextdevice', 'network',
-                                        bootmode='uefi',
-                                        persistent=False,
-                                        errnodes=errnodes)
-        if errnodes:
-            sys.stderr.write(
-                'Unable to set boot device for following nodes: {0}\n'.format(
-                    ','.join(errnodes)))
-            return 1
-        rc |= c.simple_noderange_command(args.noderange, '/power/state', 'boot')
-        return rc
-    return 0
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv[1:]))
@@ -263,11 +263,7 @@ def list_matching_macs(options, session, node=None, checknode=True):
        return [options.mac.replace(':', '-')]
    else:
        path += 'by-mac/'
-        ret = []
-        for x in session.read(path):
-            if 'item' in x and 'href' in x['item']:
-                ret.append(x['item']['href'])
-        return ret
+        return [x['item']['href'] for x in session.read(path)]

 def assign_discovery(options, session, needid=True):
    abort = False
@@ -109,12 +109,6 @@ def update_firmware(session, filename):
    if options.backup:
        upargs['bank'] = 'backup'
    noderrs = {}
-    if session.unixdomain:
-        of = open(filename, 'rb')
-        try:
-            session.add_file(filename, of.fileno(), 'rb')
-        except Exception:
-            pass
    for res in session.create(resource, upargs):
        if 'created' not in res:
            for nodename in res.get('databynode', ()):
@@ -155,6 +149,7 @@ def show_firmware(session):
            if 'databynode' not in res:
                continue
            for node in res['databynode']:
+                exitcode |= client.printerror(res['databynode'][node], node)
                if 'firmware' not in res['databynode'][node]:
                    continue
                for inv in res['databynode'][node]['firmware']:
@@ -50,7 +50,6 @@ codemappings = {
    'warning': 1,
    'critical': 2,
    'failed': 2,
-    'unknown': 2,
 }

 def main():
@@ -69,12 +69,6 @@ def install_license(session, filename):
               'management_controller/licenses/'.format(noderange)
    filename = os.path.abspath(filename)
    instargs = {'filename': filename}
-    if session.unixdomain:
-        of = open(filename, 'rb')
-        try:
-            session.add_file(filename, of.fileno(), 'rb')
-        except Exception:
-            pass
    for res in session.create(resource, instargs):
        for node in res.get('databynode', []):
            if 'error' in res['databynode'][node]:
@@ -111,12 +111,6 @@ def upload_media(noderange, media):
    resource = '/noderange/{0}/media/uploads/'.format(noderange)
    upargs = {'filename': filename}
    noderrs = {}
-    if session.unixdomain:
-        of = open(filename, 'rb')
-        try:
-            session.add_file(filename, of.fileno(), 'rb')
-        except Exception:
-            pass
    nodeurls = {}
    for res in session.create(resource, upargs):
        if 'created' not in res:
@@ -193,7 +187,5 @@ def main():
        argparser.print_help()
        sys.exit(1)
    handler(noderange, media)
-
 if __name__ == '__main__':
    main()
-    sys.exit(exitcode)
@@ -32,7 +32,7 @@ if path.startswith('/opt'):
 import confluent.client as client

 argparser = optparse.OptionParser(
-    usage='Usage: %prog [options] noderange [default|cd|network|setup|hd|usb|floppy]')
+    usage='Usage: %prog [options] noderange [default|cd|network|setup|hd]')
 argparser.add_option('-b', '--bios', dest='biosmode',
                     action='store_true', default=False,
                     help='Request BIOS style boot (rather than UEFI)')
@@ -46,12 +46,10 @@ def run():
                         help='Number of commands to run at a time')
    argparser.add_option('-n', '--nonodeprefix', action='store_true',
                         help='Do not prefix output with node names')
-    argparser.add_option('-p', '--port', type='int', default=0,
-                         help='Specify a custom port for ssh')
    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')
+                          '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()
@@ -61,7 +59,7 @@ def run():
        sys.exit(1)
    client.check_globbing(args[0])
    concurrentprocs = options.count
-    c = client.Command()
+    c = client.Command()    
    cmdstr = " ".join(args[1:])

    currprocs = 0
@@ -81,10 +79,7 @@ def run():
            cmd = ex[node]['value']
            if not isinstance(cmd, str) and not isinstance(cmd, bytes):
                cmd = cmd.encode('utf-8')
-            if options.port:
-                cmdv = ['ssh', '-p', '{0}'.format(options.port), node, cmd]
-            else:
-                cmdv = ['ssh', node, cmd]
+            cmdv = ['ssh', node, cmd]
            if currprocs < concurrentprocs:
                currprocs += 1
                run_cmdv(node, cmdv, all, pipedesc)
@@ -186,7 +186,7 @@ funmap = {

 def main():
    argparser = OptParser(
-        usage='Usage: %prog <noderange> [show|create|delete|diskset] [hotspare|jbod|unconfigured] [options]',
+        usage='Usage: %prog <noderange> [show|create|delete|diskset]',
        epilog='',
    )
    argparser.add_option('-r', '--raidlevel', type='int',
@@ -116,7 +116,7 @@ class OptParser(optparse.OptionParser):
 def main():
    argparser = OptParser(
        usage="Usage: %prog <noderange> servicedata "
-              "<directory or filename>",
+              "<filename>",
        epilog='\nservicedata will save service data to the given '
               'directory.  It is saved to the location on the relevant '
               'management server (the confluent server if running remote, '
@@ -22,23 +22,17 @@ import io
 import numpy as np

 import os
+import sixel
 import subprocess
 import sys

-try:
-    import sixel
-
-    class DumbWriter(sixel.SixelWriter):
-        def restore_position(self, output):
-            return
-except ImportError:
-    pass
+class DumbWriter(sixel.SixelWriter):
+    def restore_position(self, output):
+        return


 def plot(gui, output, plotdata, bins):
    import matplotlib as mpl
-    if gui and mpl.get_backend() == 'agg':
-        sys.stderr.write('Error: No GUI backend available and -g specified!\n')
    if not gui:
        mpl.use('Agg')
    import matplotlib.pyplot as plt
@@ -36,9 +36,7 @@ SO_PASSCRED = 16
 _attraliases = {
    'bmc': 'hardwaremanagement.manager',
    'bmcuser': 'secret.hardwaremanagementuser',
-    'switchuser': 'secret.hardwaremanagementuser',
    'bmcpass': 'secret.hardwaremanagementpassword',
-    'switchpass': 'secret.hardwaremanagementpassword',
 }

 try:
@@ -46,13 +44,6 @@ try:
 except NameError:
    pass

-
-class NestedDict(dict):
-    def __missing__(self, key):
-        value = self[key] = type(self)()
-        return value
-
-
 def stringify(instr):
    # Normalize unicode and bytes to 'str', correcting for
    # current python version
@@ -118,12 +109,6 @@ def printerror(res, node=None):
    exitcode = 0
    if 'errorcode' in res:
        exitcode = res['errorcode']
-    for node in res.get('databynode', {}):
-        exitcode = res['databynode'][node].get('errorcode', exitcode)
-        if 'error' in res['databynode'][node]:
-            sys.stderr.write('{0}: {1}\n'.format(node, res['databynode'][node]['error']))
-            if exitcode == 0:
-                exitcode = 1
    if 'error' in res:
        if node:
            sys.stderr.write('{0}: {1}\n'.format(node, res['error']))
@@ -161,7 +146,6 @@ class Command(object):
        self._prevkeyname = None
        self.connection = None
        self._currnoderange = None
-        self.unixdomain = False
        if server is None:
            if 'CONFLUENT_HOST' in os.environ:
                self.serverloc = os.environ['CONFLUENT_HOST']
@@ -171,13 +155,11 @@ class Command(object):
            self.serverloc = server
        if os.path.isabs(self.serverloc) and os.path.exists(self.serverloc):
            self._connect_unix()
-            self.unixdomain = True
        elif self.serverloc == '/var/run/confluent/api.sock':
            raise Exception('Confluent service is not available')
        else:
            self._connect_tls()
-        self.protversion = int(tlvdata.recv(self.connection).split(
-            b'--')[1].strip()[1:])
+        tlvdata.recv(self.connection)
        authdata = tlvdata.recv(self.connection)
        if authdata['authpassed'] == 1:
            self.authenticated = True
@@ -188,13 +170,6 @@ class Command(object):
            passphrase = os.environ['CONFLUENT_PASSPHRASE']
            self.authenticate(username, passphrase)

-    def add_file(self, name, handle, mode):
-        if self.protversion < 3:
-            raise Exception('Not supported with connected confluent server')
-        if not self.unixdomain:
-            raise Exception('Can only add a file to a unix domain connection')
-        tlvdata.send(self.connection, {'filename': name, 'mode': mode}, handle)
-
    def authenticate(self, username, password):
        tlvdata.send(self.connection,
                     {'username': username, 'password': password})
@@ -434,7 +409,7 @@ def send_request(operation, path, server, parameters=None):
        result = tlvdata.recv(server)


-def attrrequested(attr, attrlist, seenattributes, node=None):
+def attrrequested(attr, attrlist, seenattributes):
    for candidate in attrlist:
        truename = candidate
        if candidate.startswith('hm'):
@@ -442,16 +417,10 @@ def attrrequested(attr, attrlist, seenattributes, node=None):
        if candidate in _attraliases:
            candidate = _attraliases[candidate]
        if fnmatch.fnmatch(attr.lower(), candidate.lower()):
-            if node is None:
-                seenattributes.add(truename)
-            else:
-                seenattributes[node][truename] = True
+            seenattributes.add(truename)
            return True
        elif attr.lower().startswith(candidate.lower() + '.'):
-            if node is None:
-                seenattributes.add(truename)
-            else:
-                seenattributes[node][truename] = 1
+            seenattributes.add(truename)
            return True
    return False

@@ -467,15 +436,13 @@ def _sort_attrib(k):

 def print_attrib_path(path, session, requestargs, options, rename=None, attrprefix=None):
    exitcode = 0
-    seenattributes = NestedDict()
-    allnodes = set([])
+    seenattributes = set([])
    for res in session.read(path):
        if 'error' in res:
            sys.stderr.write(res['error'] + '\n')
            exitcode = 1
            continue
        for node in sorted(res['databynode']):
-            allnodes.add(node)
            for attr, val in sorted(res['databynode'][node].items(), key=_sort_attrib):
                if attr == 'error':
                    sys.stderr.write('{0}: Error: {1}\n'.format(node, val))
@@ -483,7 +450,7 @@ def print_attrib_path(path, session, requestargs, options, rename=None, attrpref
                if attr == 'errorcode':
                    exitcode |= val
                    continue
-                seenattributes[node][attr] = True
+                seenattributes.add(attr)
                if rename:
                    printattr = rename.get(attr, attr)
                else:
@@ -491,14 +458,14 @@ def print_attrib_path(path, session, requestargs, options, rename=None, attrpref
                if attrprefix:
                    printattr = attrprefix + printattr
                currattr = res['databynode'][node][attr]
-                if show_attr(attr, requestargs, seenattributes, options, node):
+                if show_attr(attr, requestargs, seenattributes, options):
                    if 'value' in currattr:
                        if currattr['value'] is not None:
                            val = currattr['value']
                            if isinstance(val, list):
                                val = ','.join(val)
                            attrout = '{0}: {1}: {2}'.format(
-                                node, printattr, val).strip()
+                                node, printattr, val)
                        else:
                            attrout = '{0}: {1}:'.format(node, printattr)
                    elif 'isset' in currattr:
@@ -572,39 +539,23 @@ def print_attrib_path(path, session, requestargs, options, rename=None, attrpref
                                except TypeError:
                                    pass
                        cprint(attrout)
-    somematched = set([])
-    printmissing = set([])
-    badnodes = NestedDict()
    if not exitcode:
        if requestargs:
            for attr in requestargs:
-                for node in allnodes:
-                    if attr in seenattributes[node]:
-                        somematched.add(attr)
-                    else:
-                        badnodes[node][attr] = True
-                        exitcode = 1
-        for node in sortutil.natural_sort(badnodes):
-            for attr in badnodes[node]:
-                if attr in somematched:
-                    sys.stderr.write(
-                        'Error: {0} matches no valid value for {1}\n'.format(
-                            attr, node))
-                else:
-                    printmissing.add(attr)
-        for missing in printmissing:
-            sys.stderr.write('Error: {0} not a valid attribute\n'.format(attr))
+                if attr not in seenattributes:
+                    sys.stderr.write('Error: {0} not a valid attribute\n'.format(attr))
+                    exitcode = 1
    return exitcode


-def show_attr(attr, requestargs, seenattributes, options, node):
+def show_attr(attr, requestargs, seenattributes, options):
    try:
        reverse = options.exclude
    except AttributeError:
        reverse = False
    if requestargs is None or requestargs == []:
        return True
-    processattr = attrrequested(attr, requestargs, seenattributes, node)
+    processattr = attrrequested(attr, requestargs, seenattributes)
    if reverse:
        processattr = not processattr
    return processattr
@@ -17,4 +17,4 @@


 class Types(object):
-    text, json, filehandle = range(3)
+    text, json = range(2)
@@ -15,15 +15,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-import array
-import ctypes
-import ctypes.util
 import confluent.tlv as tlv
-import eventlet.green.socket as socket
-import eventlet.green.select as select
 from datetime import datetime
 import json
-import os
 import struct

 try:
@@ -36,72 +30,6 @@ try:
 except NameError:
    pass

-class iovec(ctypes.Structure):   # from uio.h
-    _fields_ = [('iov_base', ctypes.c_void_p),
-                ('iov_len', ctypes.c_size_t)]
-
-
-iovec_ptr = ctypes.POINTER(iovec)
-
-
-class cmsghdr(ctypes.Structure):  # also from bits/socket.h
-    _fields_ = [('cmsg_len', ctypes.c_size_t),
-                ('cmsg_level', ctypes.c_int),
-                ('cmsg_type', ctypes.c_int)]
-
-    @classmethod
-    def init_data(cls, cmsg_len, cmsg_level, cmsg_type, cmsg_data):
-        Data = ctypes.c_ubyte * ctypes.sizeof(cmsg_data)
-        class _flexhdr(ctypes.Structure):
-            _fields_ = cls._fields_ + [('cmsg_data', Data)]
-
-        datab = Data(*bytearray(cmsg_data))
-        return _flexhdr(cmsg_len=cmsg_len, cmsg_level=cmsg_level,
-                        cmsg_type=cmsg_type, cmsg_data=datab)
-
-
-def CMSG_LEN(length):
-    sizeof_cmshdr = ctypes.sizeof(cmsghdr)
-    return ctypes.c_size_t(CMSG_ALIGN(sizeof_cmshdr).value + length)
-
-
-SCM_RIGHTS = 1
-
-
-class msghdr(ctypes.Structure):  # from bits/socket.h
-    _fields_ = [('msg_name', ctypes.c_void_p),
-                ('msg_namelen', ctypes.c_uint),
-                ('msg_iov', ctypes.POINTER(iovec)),
-                ('msg_iovlen', ctypes.c_size_t),
-                ('msg_control', ctypes.c_void_p),
-                ('msg_controllen', ctypes.c_size_t),
-                ('msg_flags', ctypes.c_int)]
-
-
-def CMSG_ALIGN(length):  # bits/socket.h
-    ret = (length + ctypes.sizeof(ctypes.c_size_t) - 1
-           & ~(ctypes.sizeof(ctypes.c_size_t) - 1))
-    return ctypes.c_size_t(ret)
-
-
-def CMSG_SPACE(length):  # bits/socket.h
-    ret = CMSG_ALIGN(length).value + CMSG_ALIGN(ctypes.sizeof(cmsghdr)).value
-    return ctypes.c_size_t(ret)
-
-
-class ClientFile(object):
-    def __init__(self, name, mode, fd):
-        self.fileobject = os.fdopen(fd, mode)
-        self.filename = name
-
-libc = ctypes.CDLL(ctypes.util.find_library('c'))
-recvmsg = libc.recvmsg
-recvmsg.argtypes = [ctypes.c_int, ctypes.POINTER(msghdr), ctypes.c_int]
-recvmsg.restype = ctypes.c_int
-sendmsg = libc.sendmsg
-sendmsg.argtypes = [ctypes.c_int, ctypes.POINTER(msghdr), ctypes.c_int]
-sendmsg.restype = ctypes.c_size_t
-
 def decodestr(value):
    ret = None
    try:
@@ -137,7 +65,7 @@ def _unicode_list(currlist):
            _unicode_list(currlist[i])


-def send(handle, data, filehandle=None):
+def send(handle, data):
    if isinstance(data, unicode):
        try:
            data = data.encode('utf-8')
@@ -165,27 +93,9 @@ def send(handle, data, filehandle=None):
        if tl > 16777215:
            raise Exception("JSON data exceeds protocol limits")
        # xor in the type (0b1 << 24)
-        if filehandle is None:
-            tl |= 16777216
-            handle.sendall(struct.pack("!I", tl))
-            handle.sendall(sdata)
-        else:
-            tl |= (2 << 24)
-            handle.sendall(struct.pack("!I", tl))
-            cdtype = ctypes.c_ubyte * len(sdata)
-            cdata = cdtype.from_buffer(bytearray(sdata))
-            ciov = iovec(iov_base=ctypes.addressof(cdata),
-                         iov_len=ctypes.c_size_t(ctypes.sizeof(cdata)))
-            fd = ctypes.c_int(filehandle)
-            cmh = cmsghdr.init_data(
-                cmsg_len=CMSG_LEN(
-                    ctypes.sizeof(fd)), cmsg_level=socket.SOL_SOCKET,
-                    cmsg_type=SCM_RIGHTS, cmsg_data=fd)
-            mh = msghdr(msg_name=None, msg_len=0, msg_iov=iovec_ptr(ciov),
-                        msg_iovlen=1, msg_control=ctypes.addressof(cmh),
-                        msg_controllen=ctypes.c_size_t(ctypes.sizeof(cmh)))
-            sendmsg(handle.fileno(), mh, 0)
-
+        tl |= 16777216
+        handle.sendall(struct.pack("!I", tl))
+        handle.sendall(sdata)

 def recvall(handle, size):
    rd = handle.recv(size)
@@ -215,42 +125,12 @@ def recv(handle):
    datatype = (tl & 2130706432) >> 24  # grab 7 bits from near beginning
    if dlen == 0:
        return None
-    if datatype == tlv.Types.filehandle:
-        filehandles = array.array('i')
-        rawbuffer = bytearray(2048)
-        pkttype = ctypes.c_ubyte * 2048
-        data = pkttype.from_buffer(rawbuffer)
-        cmsgsize = CMSG_SPACE(ctypes.sizeof(ctypes.c_int)).value
-        cmsgarr = bytearray(cmsgsize)
-        cmtype = ctypes.c_ubyte * cmsgsize
-        cmsg = cmtype.from_buffer(cmsgarr)
-        cmsg.cmsg_level = socket.SOL_SOCKET
-        cmsg.cmsg_type = SCM_RIGHTS
-        cmsg.cmsg_len = CMSG_LEN(ctypes.sizeof(ctypes.c_int))
-        iov = iovec()
-        iov.iov_base = ctypes.addressof(data)
-        iov.iov_len = 2048
-        msg = msghdr()
-        msg.msg_iov = ctypes.pointer(iov)
-        msg.msg_iovlen = 1
-        msg.msg_control = ctypes.addressof(cmsg)
-        msg.msg_controllen = ctypes.sizeof(cmsg)
-        select.select([handle], [], [])
-        i = recvmsg(handle.fileno(), ctypes.pointer(msg), 0)
-        cdata = cmsgarr[CMSG_LEN(0).value:]
-        data = rawbuffer[:i]
-        if cmsg.cmsg_level == socket.SOL_SOCKET and cmsg.cmsg_type == SCM_RIGHTS:
-            filehandles.fromstring(bytes(
-                cdata[:len(cdata) - len(cdata) % filehandles.itemsize]))
-        data = json.loads(bytes(data))
-        return ClientFile(data['filename'], data['mode'], filehandles[0])
-    else:
-        data = handle.recv(dlen)
-        while len(data) < dlen:
-            ndata = handle.recv(dlen - len(data))
-            if not ndata:
-                raise Exception("Error reading data")
-            data += ndata
+    data = handle.recv(dlen)
+    while len(data) < dlen:
+        ndata = handle.recv(dlen - len(data))
+        if not ndata:
+            raise Exception("Error reading data")
+        data += ndata
    if datatype == tlv.Types.text:
        return data
    elif datatype == tlv.Types.json:
@@ -7,7 +7,7 @@ Name: %{name}
 Version: %{version}
 Release: %{release}
 Source0: %{name}-%{version}.tar.gz
-License: Apache2
+License: UNKNOWN
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Prefix: %{_prefix}
@@ -19,7 +19,6 @@ alias nodebmcreset='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export
 alias nodeboot='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodeboot'
 alias nodeconfig='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodeconfig'
 alias nodeconsole='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodeconsole'
-alias nodedeploy='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodedeploy'
 alias nodedefine='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodedefine'
 alias nodeeventlog='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodeeventlog'
 alias nodefirmware='CURRENT_CMDLINE=$(HISTTIMEFORMAT= builtin history 1); export CURRENT_CMDLINE; nodefirmware'
@@ -91,7 +90,7 @@ _confluent_nodeidentify_completion()

 _confluent_nodesetboot_completion()
 {
-    COMP_CANDIDATES=("default,cd,network,setup,hd,floppy,usb -h -b -p")
+    COMP_CANDIDATES=("default,cd,network,setup,hd -h -b -p")
    _confluent_generic_completion
 }

@@ -138,37 +137,6 @@ _confluent_nodefirmware_completion()
    fi
 }

-_confluent_osimage_completion()
-{
-    _confluent_get_args
-    if [ $NUMARGS == 2 ]; then
-        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]}))
-    elif [ ${CMPARGS[1]} == 'import' ]; then
-        compopt -o default
-        COMPREPLY=()
-        return
-    elif [ ${CMPARGS[1]} == 'updateboot' ]; then
-        COMPREPLY=($(compgen -W "-n $(confetty show /deployment/profiles|sed -e 's/\///')" -- "${COMP_WORDS[COMP_CWORD]}"))
-        return
-    fi
-}
-
-_confluent_nodedeploy_completion()
-{
-    _confluent_get_args
-    if [ $NUMARGS -gt 2 ]; then
-        COMPREPLY=($(compgen -W "-n $(confetty show /deployment/profiles|sed -e 's/\///')" -- "${COMP_WORDS[COMP_CWORD]}"))
-        return
-    fi
-    if [ $NUMARGS -lt 3 ]; then
-        _confluent_nr_completion
-        return;
-    fi
-}
-
 _confluent_nodeshell_completion()
 {
    _confluent_get_args
@@ -258,8 +226,6 @@ _confluent_nr_completion()
    CMPARGS=($COMP_LINE)
    _confluent_get_args
    if [ $NUMARGS -gt 2 ]; then
-        compopt -o default
-        COMPREPLY=()
        return;
    fi
    INPUT=${COMP_WORDS[COMP_CWORD]}
@@ -300,8 +266,6 @@ complete -F _confluent_nr_completion nodeconfig
 complete -F _confluent_nn_completion nodeconsole
 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_ng_completion nodegroupattrib
 complete -F _confluent_ng_completion nodegroupremove
 complete -F _confluent_nr_completion nodehealth
@@ -3,7 +3,7 @@ collate(1) -- Organize text input by node

 ## SYNOPSIS

-`<other command> | collate [-a] [-b] [-d] [-w] [-g] [-s] [-c] [-r] [-l lognametemplate]`
+`<other command> | collate [-a] [-d] [-w] [-s] [-c] [-r] [-l lognametemplate]`

 ## DESCRIPTION

@@ -21,23 +21,19 @@ node and group names sorted alphanumerically.
   when output differs along a telling group boundary.  For example, if
   output suggests a large number of nodes are unreachable, abbreviate
   showing 'rack1' as being unreachable may make more obvious a possible cause.
-   
-* `-b`, `--base`:
-   Use given node as reference for comparison when using
-   -d, instead of using the most common result      

 * `-d`, `--diff`:
   Express all but the most common result group in terms of diff from
   the most common result group
-   
+
+* `-l`, `--log`:
+   Save output per node to individual log files, replacing {node} in the name
+   with the nodename of each
+
 * `-w`, `--watch`:
   Update results dynamically as data becomes available, rather than
   waiting    for the command to fully complete.
-   
-* `-g`, `--groupcount`:
-   Show count of output groups rather than the actual
-   output
-   
+
 * `-s`, `--skipcommon`:
   Suppress printing of the most common result text group.  This is used to
   focus on stray output against a well known and expected result.
@@ -49,10 +45,6 @@ node and group names sorted alphanumerically.
 * `-r`, `--reverse`:
    Rather than starting with most common to least common, start with
    the least common and print the most common last.
-    
-* `-l`, `--log`:
-   Save output per node to individual log files, replacing {node} in the name
-   with the nodename of each
   
 ## EXAMPLES
 * Organizing power state of multiple nodes:  
@@ -6,8 +6,7 @@ collective(1) -- Check and manage a confluent collective
 `collective invite <server>`  
 `collective join <server> [-i TOKEN]`  
 `collective show`  
-`collective gencert`
-`collective delete`
+`collective gencert`  


 ## DESCRIPTION
@@ -15,18 +15,6 @@ be mostly an aid for developing client software, with
 day to day administration generally being easier with
 the various function specific commands.

-## OPTIONS
-
-* `-s`, `--server`:
-  Confluent instance to connect to
-
-* `-c`, `--control`:
-  Path to offer terminal control
-
-* `-m`, `--mintime`:
-  Minimum time to run or else pause for input (used to
-  keep a terminal from closing quickly on error)
-
 ## COMMANDS

 The CLI may be navigated by shell commands and some other
@@ -3,7 +3,8 @@ confluentdbutil(8) -- Backup or restore confluent database

 ## SYNOPSIS

-`confluentdbutil [options] [dump|restore] <path>`
+
+`confluentdbutil [options] <dump|restore> <path>`

 ## DESCRIPTION

@@ -18,25 +19,8 @@ the json files (password protected, removed from the files, or unprotected).
 * `-p`, `--password`:
  If specified, information such as usernames and passwords will be encrypted
  using the given password.
-  
-* `-i`, `--interactivepassword`:
-  Prompt for password.  
-  
 * `-r`, `--redact`:
  Indicates to replace usernames and passwords with a dummy string rather
  than included.
-  
 * `-u`, `--unprotected`:
-  The keys.json file will include the encryption keys without any protection.
-  
-* `-s`, `--skipkeys`:
-  This specifies to dump the encrypted data without
-  dumping the keys needed to decrypt it.  This is
-  suitable for an automated incremental backup, where an
-  earlier password protected dump has a protected
-  keys.json file, and only the protected data is needed.
-  keys do not change and as such they do not require
-  incremental backup.
-  
-  * `-h`, `--help`:
-  Show help message and exit
+  The keys.json file will include the encryption keys without any protection.
@@ -40,25 +40,12 @@ See nodegroupattrib(8) command on how to manage attributes on a group level.

 * `-b`, `--blame`:
  Annotate inherited and expression based attributes to show their base value.
-  
 * `-c`, `--clear`:
-  Clear specified nodeattributes.
-  
+  Clear specified nodeattributes
 * `-e`, `--environment`:
-  Set specified attributes based on exported environment variable of matching name. 
-  Environment variable names may be lower case or all upper case. 
-  Replace . with _ as needed (e.g. info.note may be specified as either $info_note or $INFO_NOTE
-  
+  Set specified attributes based on exported environment variable of matching name.  Environment variable names may be lower case or all upper case.  Replace . with _ as needed (e.g. info.note may be specified as either $info_note or $INFO_NOTE
 * `-p`, `--prompt`:
-  Request interactive prompting to provide values rather than the command line
-  or environment variables.
-  
-* `-m MAXNODES`, `--maxnodes=MAXNODES`:
-  Prompt if trying to set attributes on more than
-  specified number of nodes.
-
-* `-h`, `--help`:
-  Show help message and exit
+  Request interactive prompting to provide values rather than the command line or environment variables.

 ## EXAMPLES
 * Listing matching nodes of a simple noderange:
@@ -9,15 +9,6 @@ nodebmcreset(8) -- Reset management controller

 `nodebmcreset` allows you to reset the management controller of the specified noderange

-## OPTIONS
-
-* `-m MAXNODES`, `--maxnodes=MAXNODES`:
-  Number of nodes to affect before prompting for
-  confirmation
-  
-* `-h`, `--help`:
-  Show help message and exit  
-
 ## EXAMPLES:

 * Reset the management controller for nodes n1 through n4:
@@ -3,7 +3,8 @@ nodeboot(8) -- Reboot a confluent node to a specific device

 ## SYNOPSIS

-`nodeboot [options] <noderange> [default|cd|network|setup|hd]`  
+`nodeboot <noderange>`  
+`nodeboot [options] <noderange>` [default|cd|network|setup|hd]  

 ## DESCRIPTION

@@ -24,13 +25,6 @@ device without inducing a reboot, see the `nodesetboot` command.
 * `-p`, `--persist`:
  For a system that supports it, mark the boot override to persist rather than
  be a one time change.  Many systems do not support this functionality.
-  
-* `-m MAXNODES`, `--maxnodes=MAXNODES`:
-  Specify a maximum number of nodes to boot, prompting
-  if over the threshold
-  
-* `-h`, `--help`:
-  Show help message and exit  

 * `default`:
  Request a normal default boot with no particular device override
@@ -3,7 +3,8 @@ nodeconfig(8) -- Show or change node configuration

 ## SYNOPSIS

-`nodeconfig [options] <noderange> [setting|setting=value]`
+`nodeconfig <noderange> [options] [<configuration>..]`  
+`nodeconfig <noderange> [options] [<configuration=value>..]`  

 ## DESCRIPTION

@@ -13,12 +14,6 @@ running configuration on the node firmware.  Calling without '=' will show the
 current value, and '=' will change the value.  Network information can be
 given as a node expression, as documented in the man page for nodeattribexpressions(5).

-Note that when using nodeconfig to submit changes, it will exit when the change
-is accepted, but the endpoint may not have fully processed it. Doing a show
-immediately after doing a set may reflect older information. Also, if changing
-BIOS/UEFI settings, the change may appear in output, but generally won't
-actually be in effect until a reboot.
-
 ## OPTIONS

 * `-c`, `--comparedefault`:
@@ -26,13 +21,6 @@ actually be in effect until a reboot.
  no configuration values are specified, it will show only those that differ.
  If combined with `-x`, will show all differing values except those indicated
  by `-x`
-  
-* `-b`, `--batch`:
-   Provide arguments as lines of a file, rather than the command line.  
-   
-* `-d`, `--detail`:
-  Provide detailed data as available.  This can include help text and valid
-  values for a setting.   

 * `-e`, `--extra`:
   Read settings that are generally not needed, but may be slow to retrieve.
@@ -43,21 +31,18 @@ actually be in effect until a reboot.
  Rather than listing only the specified configuration parameters, list all
  attributes except for the specified ones

-* `-a`, `--advanced`:
-  Include advanced settings, which are normally not intended to be used
-  without direction from the relevant server vendor.
+* `-d`, `--detail`:
+  Provide detailed data as available.  This can include help text and valid
+  values for a setting.

 * `-r`, `--restoredefault`:
  Request that the specified component of the targeted nodes will have its
  configuration reset to default.  Currently the only component implemented
  is uefi.

-* `-m MAXNODES`, `--maxnodes=MAXNODES`:
-  Specify a maximum number of nodes to configure, prompting if over 
-  the threshold  
-  
-* `-h`, `--help`:
-  Show help message and exit  
+* `-b`, '--batch':
+   Provide arguments as lines of a file, rather than the command line.
+

 ## EXAMPLES
 * Showing the current IP configuration of noderange BMC/IMM/XCC:
@@ -1,46 +0,0 @@
-nodedeploy(8) -- Request preparation and/or initiating a node deployment
-=========================================================================
-
-## SYNOPSIS
-
-`nodedeploy [-h] [-c] [-n] [-p] [-m MAXNODES] <noderange> [profile]`  
-
-## DESCRIPTION
-
-**nodedeploy** configures attributes and interacts with BMC devices as appropriate
-to change the operating system on the noderange to that indicated by `profile`. Tab completion
-is supported under bash to help list and select a profile name. `-n` indicates that it
-will be a network based deployment (either HTTP or PXE) and `-p` suppresses any activity
-that requires the BMC (e.g. setting the next boot device and rebooting the system). Currently
-**nodedeploy** only supports `-n` style deployment flows. Without options it shows the current
-deployment status.
-
-## OPTIONS
-
-* `-c`, `--clear`:
-  Remove any pending deployment action
-
-* `-n`, `--network`:
-  Prepare for either an HTTP or PXE based deployment, setting boot device to network and rebooting unless `-p` is specified.
-
-* `-p`, `--prepareonly`:
-  Prepare the network services for deployment, but do not interact with BMCs. This is intended for scenarios where
-  the boot device control and server restart will be handled outside of confluent.
-  
-* `-m MAXNODES`, `--maxnodes=MAXNODES`: 
-  Specifiy a maximum nodes to be deployed.
-  
-* `-h`, `--help`:
-  Show help message and exit  
-
-## EXAMPLES
-* Begin the instalalation of a profile of CentOS 8.2:  
-   `# nodedeploy d4 -n centos-8.2-x86_64-default`  
-   `d4: network`  
-   `d4: reset`  
-
-* Check current deployment state of nodes:
-  `# nodedeploy d4`  
-  `d4: pending: centos-8.2-x86_64-default (node authentication armed)`  
-
-
@@ -23,9 +23,6 @@ data may be filtered by various parameters, as denoted in the options below.
 **nodediscover assign** performs manual discovery, assigning an entry to a node
 identity or, using `-i`, using a csv file to assign nodes all at once.  For
 example, a spreadsheet of serial numbers to desired node names could be used.
-Note that if you see that the host is unreachable, it may be due to the IP
-address on the endpoint having changed since last detected. In such a case, it
-may help to **clear** and try **assign** again.

 **nodediscover rescan** requests the server to do an active sweep for new
 devices.  Generally every effort is made to passively detect devices as they
@@ -3,22 +3,14 @@ nodeeventlog(8) -- Pull eventlog from confluent nodes

 ## SYNOPSIS

-`nodeeventlog [options] <noderange> [clear]`  
+`nodeeventlog <noderange>`  
+`nodeeventlog <noderange> [clear]`

 ## DESCRIPTION

 `nodeeventlog` pulls and optionally clears the event log from the requested
 noderange.

-## OPTIONS
-
-* `-m MAXNODES`, `--maxnodes=MAXNODES`:
-  Specify a maximum number of nodes to clear if clearing log, prompting if 
-  over the threshold 
-  
-* `-h`, `--help`:
-  Show help message and exit  
-
 ## EXAMPLES
 * Pull the event log from n2 and n3:
  `# nodeeventlog n2,n3`  
@@ -3,7 +3,9 @@ nodefirmware(8) -- Report firmware information on confluent nodes

 ## SYNOPSIS

-`nodefirmware <noderange> [list][update [--backup <file>]]|[<components>]`
+`nodefirmware <noderange>`  
+`nodefirmware <noderange> list|<components>|core`  
+`nodefirmware <noderange> update [--backup] <filename>`  

 ## DESCRIPTION

@@ -24,18 +26,6 @@ the out of band facilities.  Firmware updates can end in one of three states:
 * `pending`:  The firmware update process has completed, but the firmware will not be active until the relevant component next resets.  Generally speaking, for UEFI update the system will need a reboot, and for BMC updates, the `nodebmcreset` command will begin the process to activate the firmware.
 * `complete`:  The firmware update process has completed and activation has proceeded.  Note that while the activation process has commenced, the component may still be in the process of rebooting when nodefirmware exits.

-## OPTIONS
-
-* `-b`, `--backup`:
-  Target a backup bank rather than primary
-  
-* `-m MAXNODES`, `--maxnodes=MAXNODES`:
-  When updating, prompt if more than the specified number of servers will 
-  be affected  
-  
-* `-h`, `--help`:
-  Show help message and exit    
-
 ## EXAMPLES

 * Pull firmware from a node:
@@ -25,17 +25,8 @@ the attributes are set on the node versus a group to which a node belongs.

 ## OPTIONS

-* `-b`, `--blame`:
-  Show information about how attributes inherited
-
-* `-e`, `--environment`:
-  Set attributes, but from environment variable of same name
-
 * `-c`, `--clear`:
  Clear specified nodeattributes.
-  
-* `-p`, `--prompt`:
-  Prompt for attribute values interactively

 ## EXAMPLES

@@ -15,7 +15,3 @@ to that directory. The `install` command will take the specified filename and in
 argument may be of the form  xcc_fod_0034_7X21{id.serial}.key to have the serial number substituted
 to allow unique licenses to be specified in a single command.

-## OPTIONS
-
-* `-m`, `--maxnodes`:
-  Specify a maximum number of nodes to delete licenses from, prompting if over the threshold
@@ -34,8 +34,8 @@ the host platform attempts.

 ## OPTIONS

-* `-h`, `--help`:
-  Show help message and exit
+* `-c`:
+  Specify the maximum number of instances to run concurrently.

 ## EXAMPLES
 * Listing currently mounted media:
@@ -30,9 +30,6 @@ off will not react to this request.

 * `-p`, '--showprevious':
   Show previous power state for all directives that may change power state.
-   
-* `-h`, `--help`:
-  Show help message and exit   

 ## EXAMPLES
 * Get power state of nodes n1 through n4:
@@ -9,11 +9,6 @@ noderemove(8) -- Remove nodes from the confluent management service

 `noderemove` simply removes the given noderange from the confluent database.

-## OPTIONS
-
-* `-m`, `--maxnodes`:
-    Specify a maximum number of nodes to delete, prompting if over the
-    threshold

 ## EXAMPLES

@@ -11,13 +11,9 @@ nodereseat(8) -- Request a reseat of a node
 node's slot.  This should be equivalent to removing the system entirely from
 the chassis and putting it back in, but without actually having to do so.

-## OPTIONS
-
-* `-m`, `--maxnodes`:
-    Specify a maximum number of nodes to reseat, prompting if over the threshold
-
 ## EXAMPLES

 * Reseating the node `s1`:
    `# nodereseat s1`  
    `s1: Reseat successful`  
+
@@ -12,12 +12,10 @@ noderange. This will present progress as percentage for all nodes.

 ## OPTIONS

-* `-c`, `-f`, `--count`:
+* `-m`:
+  Specify maximum number of nodes for noderange max.
+
+* `-c`:
  Specify how many rsync executions to do concurrently.  If noderange
  exceeds the count, then excess nodes will wait until one of the
-  active count completes. 
-  
-* `-m`, `--maxnodes`:
-  Specify a maximum number of nodes to run rsync to, prompting if over the
-  threshold
-  
+  active count completes.
@@ -13,21 +13,6 @@ nodeattribexpressions(5) are expanded prior to execution of the command.  For
 noderun, the commands are locally executed.  To execute commands on the nodes
 themselves, see nodeshell(8).

-## OPTIONS
-
-* `-f`, `-c`, `--count`:
-  Number of commands to run at a time
-  
-* `-n`, `--nonodeprefix`:
-  Do not prefix output with node names
-  
-* `-m MAXNODES`, `--maxnodes=MAXNODES`:
-  Specify a maximum number of nodes to run the command with, prompting if over
-  the threshold
-  
-* `-h`, `--help`:
-  Show help message and exit
-
 ## EXAMPLES

 * Run ping against nodes n1 through n4:
@@ -29,10 +29,6 @@ interval of 1 second is used.
  Perform the specified number of readings, waiting `-i` indicated interval or 1 second if not
  otherwise indicated.

-* `-s`, `--skipnumberless`:
-  Return only sensors that provide numeric data (e.g. temperature, fanspeed),
-  ignoring sensors that do not provide numeric data.
-
 ## EXAMPLES
 * Retrieving all temperature related sensors from one system  
  `# nodesensors n1 temperature`  
@@ -2,8 +2,9 @@ nodesetboot(8) -- Check or set next boot device for noderange
 ====================================================

 ## SYNOPSIS
-  
-`nodesetboot [options] <noderange> [default|cd|network|setup|hd|usb|floppy]`
+
+`nodesetboot <noderange>`  
+`nodesetboot [options] <noderange> [default|cd|network|setup|hd]`

 ## DESCRIPTION

@@ -20,8 +21,6 @@ to use `nodesetboot <noderange> setup` and then initiate a reboot from within
 the operating system with ssh or similar rather than using the remote hardware
 control.

-Running the command with no target queries the current setting.
-
 ## OPTIONS

 * `-b`, `--bios`:
@@ -34,13 +33,6 @@ Running the command with no target queries the current setting.

 * `-u`, `--uefi`:
  This flag does nothing, it is for command compatibility with xCAT's rsetboot
-  
-* `-m MAXNODES`, `--maxnodes=MAXNODES`:
-  Specify a maximum number of nodes to modify next boot device, prompting if
-  over the threshold
-  
-* `-h`, `--help`:
-  Show help message and exit  

 * `default`:
  Request a normal default boot with no particular device override
@@ -50,14 +42,6 @@ Running the command with no target queries the current setting.
  remote media mounted as CD/DVD, and detachable hard disks drives such as usb
  key devices.
  
-* `floppy`:
-  Request boot from floppy.  Generally speaking firmware uses this to mean a USB
-  flash drive or similar (whether virtual or physical).
-
-* `usb`:
-  Request boot from usb.  Generally speaking firmware uses this to mean a USB
-  flash drive or similar (whether virtual or physical).
-
 * `network`:
  Request boot to network
  
@@ -3,7 +3,7 @@ nodeshell(8) -- Execute command on many nodes in a noderange through ssh

 ## SYNOPSIS

-`nodeshell [options] <noderange> <command to execute on each node>`
+`nodeshell <noderange> [options] <command to execute on each node>`

 ## DESCRIPTION

@@ -13,20 +13,10 @@ nodeattribexpressions(5).  `nodeshell` provides stdout as stdout and stderr
 as stderr, unlike psh which combines all stdout and stderr into stdout.

 ## OPTIONS
-  
-* `-c COUNT`, `-f COUNT`, `--count=COUNT`
-  Specify the maximum number of instances to run concurrently

-* `-m MAXNODES`, `--maxnodes=MAXNODES`
-  Specify a maximum number of nodes to run remote ssh command to, prompting
-  if over the threshold
- 
-* `-n`, `--nonodeprefix`
-  Do not prefix output with node names  
+* `-c`:
+  Specify the maximum number of instances to run concurrently.

-* `-p PORT`, `--port=PORT`
-  Specify a custom port for ssh
-       
 ## EXAMPLES

 * Running `echo hi` on for nodes:
@@ -3,15 +3,12 @@ nodestorage(8) -- Examine/Modify storage configuration of a node

 ## SYNOPSIS

-`nodestorage <noderange> [show|create|delete|diskset] [hotspare|jbod|unconfigured] [options]`  
+`nodestorage <noderange> [show|create|delete] [options]`  

 ## DESCRIPTION

 `nodestorage` provides access to the remote storage configuration of
-the noderange. The `show` subcommand will show current storage configuration,
-`create` can be used to create new arrays or volumes, `delete` can be used to
-remove volumes and arrays, and `diskset` can modify the usage of disks
-indicated by `-d` to either be `unconfigured`, `jbod`, or `hotspare`.
+the noderange.

 ## OPTIONS
 * `-r` **RAIDLEVEL**, `--raidlevel`=**RAIDLEVEL**:
@@ -32,15 +29,6 @@ indicated by `-d` to either be `unconfigured`, `jbod`, or `hotspare`.
  volumes, or selecting a volume for delete.  Default
  behavior is to use implementation provided default

-* `-z` **STRIPSIZES**, `--stripsizes`=**STRIPSIZES**:
-  Comma separated list of stripsizes to use when creating volumes.
-  This value is in kilobytes.  The default behavior is to allow the
-  storage controller to decide
-
-* `-m` **MAXNODES**, `--maxnodes`=**MAXNODES**:
-  Specify a maximum number of nodes to configure storage on, prompting
-  if over the threshold
-
 ## EXAMPLES

 * Deleting the volume `somedata`:
@@ -19,12 +19,6 @@ running in collective mode.
 Note that due to vendor filename requirements, any filename may have vendor
 specific suffixes added to any file produced.

-## OPTIONS
-
-* `-m`, `--maxnodes`:
-  Specify a maximum number of nodes to download diagnostic data from, prompting
-    if over the threshold
-
 ## EXAMPLES

 * Download support data from a single node to a specific filename  
@@ -1,17 +0,0 @@
-osdeploy(8) --- Configure general OS deployment facilities of confluent
-==========================================================================
-
-## SYNOPSIS
-
-`osdeploy import <iso>`  
-`osdeploy updateboot <profile>`  
-`osdeploy initialize [-h] [-g] [-u] [-s] [-k] [-t] [-p] [-i] [-l] [-a]`  
-
-## DESCRIPTION
-
-**osdeploy** manages the facilities and os deployment content of a confluent server. The
-`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. Run `osdeploy initialize -h` for more detail
-on the options offered by `osdeploy initialize`
@@ -1,49 +0,0 @@
-stats(8) -- Common basic statistics on typical numeric data in output
-==============================
-
-## SYNOPSIS
-
-`<other command> | stats [-c N] [-d D] [-x|-g|-t|-o image.png] [-s N] [-v] [-b N]
-
-## DESCRIPTION
-
-The **stats** command helps analyze common numerical data such as performance numbers
-or temperatures or any other numerical value.
-
-By default it looks for the last numerical output on the first line to identify the numerical column
-and analyze that number. This can be overriden by **-c COLUMN** to indicate a column. By default,
-whitespace and commas are treated to delimit columns, and **-d DELIMITER** can be used to override.
-
-By default it outputs basic statistics, but a histogram is available either text or through X11 output
-or sixel or output to an image file depending on whether **-x**, **-g**, **-t*, or **-o image.png** is
-used.
-
-## OPTIONS
-
- * `-c N`:
-   Select column number. Defaults to last column that appears numeric
-
- * `-d D`:
-   Specify a custom column delimiter
-
- * `-x`:
-     Output in Sixel format (supported by mlterm and PuTTY, among others)
-
- * `-g`:
-   Try to open histogram as an X window
-
- * `-t`:
-   Output histogram as bars rendered by =
-
- * `-o image.png`:
-   Write graphical histogram to image.png.
-
- * `-s N`:
-   Ignore specified number of lines as header content before processing numbers
-
- * `-v`:
-   Treat value before : on each line as a label, and show which labels belong to which histogram buckets.
-
- * `-b N`:
-   Specify a custom number of buckets for histogram. The default is 10.
-   
@@ -1,11 +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.spec.tmpl > confluent_osdeploy.spec
-cd ..
-tar Jcvf confluent_osdeploy.tar.xz confluent_osdeploy
-mv confluent_osdeploy.tar.xz ~/rpmbuild/SOURCES/
-cd -
-rpmbuild -ba confluent_osdeploy.spec
@@ -1,163 +0,0 @@
-#!/usr/bin/python
-try:
-    import http.client as client
-except ImportError:
-    import httplib as client
-import os
-import socket
-import subprocess
-import ssl
-import sys
-
-def get_apikey(nodename, mgr):
-    sealnew = True
-    if os.path.exists('/etc/confluent/confluent.apikey'):
-        return open('/etc/confluent/confluent.apikey').read().strip()
-    apikey = subprocess.check_output(['/opt/confluent/bin/clortho', nodename, mgr])
-    if not isinstance(apikey, str):
-        apikey = apikey.decode('utf8')
-    if apikey.startswith('SEALED:'):
-        sealnew = False
-        with open('/etc/confluent/confluent.sealedapikey', 'w+') as apiout:
-            apiout.write(apikey[7:])
-        with open('/etc/confluent/confluent.sealedapikey') as inp:
-            sp = subprocess.Popen(['/usr/bin/clevis-decrypt-tpm2'],
-                stdin=inp, stdout=subprocess.PIPE)
-            apikey = sp.communicate()[0]
-            if not isinstance(apikey, str):
-                apikey = apikey.decode('utf8')
-    with open('/etc/confluent/confluent.apikey', 'w+') as apiout:
-        apiout.write(apikey)
-    if sealnew and os.path.exists('/usr/bin/clevis-encrypt-tpm2'):
-        try:
-            with open('/etc/confluent/confluent.apikey') as apin:
-                sealed = subprocess.check_output(
-                    ['/usr/bin/clevis-encrypt-tpm2', '{}'], stdin=apin)
-            print(HTTPSClient().grab_url('/confluent-api/self/saveapikey', sealed).decode())
-        except Exception:
-            sys.stderr.write('Unable to persist API key through TPM2 sealing\n')
-    apikey = apikey.strip()
-    os.chmod('/etc/confluent/confluent.apikey', 0o600)
-    return apikey
-
-class HTTPSClient(client.HTTPConnection, object):
-    def __init__(self, json=False, port=443):
-        self.stdheaders = {}
-        info = open('/etc/confluent/confluent.info').read().split('\n')
-        host = None
-        mgtiface = None
-        havedefault = '0'
-        for line in info:
-            if line.startswith('NODENAME:'):
-                node = line.split(' ')[1]
-                self.stdheaders['CONFLUENT_NODENAME'] = node
-            if line.startswith('MANAGER:') and not host:
-                host = line.split(' ')[1]
-            if line.startswith('EXTMGRINFO:'):
-                extinfo = line.split(' ')[1]
-                extinfo = extinfo.split('|')
-                if not mgtiface:
-                    host, mgtiface, havedefault = extinfo[:3]
-                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 json:
-            self.stdheaders['ACCEPT'] = 'application/json'
-        try:
-            info = open('/etc/confluent/confluent.deploycfg').read().split('\n')
-        except Exception:
-            info = None
-        if info:
-            for line in info:
-                if line.startswith('deploy_server: '):
-                    host = line.split(': ', 1)[1]
-                    break
-        self.stdheaders['CONFLUENT_APIKEY'] = get_apikey(node, host)
-        if mgtiface:
-            self.stdheaders['CONFLUENT_MGTIFACE'] = mgtiface
-        client.HTTPConnection.__init__(self, host, port)
-        self.connect()
-
-    def set_header(self, key, val):
-        self.stdheaders[key] = val
-
-    def connect(self):
-        addrinf = socket.getaddrinfo(self.host, self.port)[0]
-        psock = socket.socket(addrinf[0])
-        psock.connect(addrinf[4])
-        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:
-            self.stdheaders['Host'] = '[{0}]'.format(host)
-        else:
-            self.stdheaders['Host'] = '{0}'.format(host)
-        ctx.verify_mode = ssl.CERT_REQUIRED
-        ctx.check_hostname = True
-        self.sock = ctx.wrap_socket(psock, server_hostname=host)
-
-    def grab_url(self, url, data=None, returnrsp=False):
-        return self.grab_url_with_status(url, data, returnrsp)[1]
-
-    def grab_url_with_status(self, url, data=None, returnrsp=False):
-        if data:
-            method = 'POST'
-        else:
-            method = 'GET'
-        self.request(method, url, data, headers=self.stdheaders)
-        rsp = self.getresponse()
-        if rsp.status >= 200 and rsp.status < 300:
-            if returnrsp:
-                return rsp.status, rsp
-            else:
-                return rsp.status, rsp.read()
-        raise Exception(rsp.read())
-
-if __name__ == '__main__':
-    data = None
-    json = False
-    if '-j' in sys.argv:
-        json = True
-    if len(sys.argv) == 1:
-        HTTPSClient()
-        sys.exit(0)
-    try:
-        outbin = sys.argv.index('-o')
-        sys.argv.pop(outbin)
-        outbin = sys.argv.pop(outbin)
-    except ValueError:
-        outbin = None
-    try:
-        waitfor = sys.argv.index('-w')
-        sys.argv.pop(waitfor)
-        waitfor = int(sys.argv.pop(waitfor))
-    except ValueError:
-        waitfor = None
-    try:
-        data = sys.argv.index('-d')
-        sys.argv.pop(data)
-        data = sys.argv.pop(data)
-    except ValueError:
-        data = None
-    if outbin:
-        with open(outbin, 'wb') as outf:
-            reader = HTTPSClient(json=json).grab_url(
-                sys.argv[1], data, returnrsp=True)
-            chunk = reader.read(16384)
-            while chunk:
-                outf.write(chunk)
-                chunk = reader.read(16384)
-        sys.exit(0)
-    if len(sys.argv) > 2 and os.path.exists(sys.argv[-1]):
-        data = open(sys.argv[-1]).read()
-    if waitfor:
-        client = HTTPSClient(json=json)
-        status = 201
-        while status != waitfor:
-            status, rsp = client.grab_url_with_status(sys.argv[1], data)
-            sys.stdout.write(rsp.decode())
-    else:
-        sys.stdout.write(HTTPSClient(json=json).grab_url(sys.argv[1], data).decode())
@@ -1,60 +0,0 @@
-Name: confluent_osdeploy-x86_64
-Version: #VERSION#
-Release: 1
-Summary: OS Deployment support for confluent
-
-License: Apache2
-URL: http://hpc.lenovo.com/
-Source0: confluent_osdeploy.tar.xz
-BuildArch: noarch
-Requires: confluent_ipxe mtools tar
-BuildRoot: /tmp
-
-%description
-This contains support utilities for enabling deployment of x86_64 architecture systems
-
-
-%define debug_package %{nil}
-
-%prep
-%setup -n confluent_osdeploy
-
-%build
-mkdir -p opt/confluent/bin
-cd utils
-make all
-cp copernicus clortho autocons ../opt/confluent/bin
-cd ..
-for os in rhvh4 el7 genesis el8 suse15 ubuntu20.04; do
-    mkdir ${os}out
-    cd ${os}out
-    cp -a ../opt .
-    cp -a ../${os}/initramfs/* .
-    cp -a ../common/* .
-    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/* .
-chmod +x bin/* opt/confluent/bin/*
-tar zcvf ../addons.tgz *
-mv ../addons.tgz .
-cd ..
-cp -a esxi7out esxi6out
-cp -a esxi7 esxi6
-
-%install
-for os in rhvh4 el7 el8 genesis suse15 ubuntu20.04 esxi6 esxi7; 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
-    cp -a $os/profiles/* %{buildroot}/opt/confluent/lib/osdeploy/$os/profiles
-    find %{buildroot}/opt/confluent/lib/osdeploy/$os/profiles -name .gitignore -exec rm -f {} +
-done
-
-%files
-/opt/confluent/lib/osdeploy
@@ -1,18 +0,0 @@
-#!/bin/bash
-echo -n "" >> /tmp/net.ifaces
-cat /tls/*.0 >> /etc/pki/tls/certs/ca-bundle.crt
-if ! grep console= /proc/cmdline >& /dev/null; then
-    autocons=$(/opt/confluent/bin/autocons)
-    if [ -n "$autocons" ]; then
-        echo console=$autocons |sed -e 's!/dev/!!' >> /tmp/01-autocons.conf
-        autocons=${autocons%,*}
-	echo $autocons > /tmp/01-autocons.devnode
-	echo "Detected firmware specified console at $(cat /tmp/01-autocons.conf)" > $autocons
-        echo "Initializing auto detected console when installer starts" > $autocons
-    fi
-fi
-if grep console=ttyS /proc/cmdline >& /dev/null; then
-    echo "Serial console has been requested in the kernel arguments, the local video may not show progress" > /dev/tty1
-fi
-. /lib/anaconda-lib.sh
-wait_for_kickstart
@@ -1,98 +0,0 @@
-#!/bin/sh
-[ -e /tmp/confluent.initq ] && return 0
-if [ -f /tmp/dd_disk ]; then
-    for dd in $(cat /tmp/dd_disk); do
-        if [ -e $dd ]; then
-            driver-updates --disk $dd $dd
-        fi
-    done
-fi
-mkdir -p /etc/confluent
-cat /tls/*.pem > /etc/confluent/ca.pem
-TRIES=0
-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
-    /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
-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
-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)
-proto=${proto#protocol: }
-textconsole=$(grep ^textconsole: /etc/confluent/confluent.deploycfg)
-textconsole=${textconsole#textconsole: }
-if [ "$textconsole" = "true" ] && ! grep console= /proc/cmdline > /dev/null; then
-	autocons=$(cat /tmp/01-autocons.devnode)
-	if [ ! -z "$autocons" ]; then
-	    echo Auto-configuring installed system to use text console
-	    echo Auto-configuring installed system to use text console > $autocons
-	    cp /tmp/01-autocons.conf /etc/cmdline.d/
-	else
-	    echo "Unable to automatically detect requested text console"
-	fi
-fi
-
-echo inst.repo=$proto://$mgr/confluent-public/os/$profilename/distribution >> /etc/cmdline.d/01-confluent.conf
-echo inst.ks=$proto://$mgr/confluent-public/os/$profilename/kickstart >> /etc/cmdline.d/01-confluent.conf
-kickstart=$proto://$mgr/confluent-public/os/$profilename/kickstart
-root=anaconda-net:$proto://$mgr/confluent-public/os/$profilename/distribution
-export kickstart
-export root
-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
-    if [ $nameserversec = 1 ]; then
-        if [[ $entry == "-"* ]] && [[ $entry != "- ''" ]]; then
-            echo nameserver=${entry#- } >> /etc/cmdline.d/01-confluent.conf
-            continue
-        fi
-    fi
-    nameserversec=0
-    if [ "${entry%:*}" = "nameservers" ]; then
-        nameserversec=1
-        continue
-    fi
-done < /etc/confluent/confluent.deploycfg
-
@@ -1 +0,0 @@
-[ -e /tmp/confluent.initq ]
@@ -1,21 +0,0 @@
-#!/bin/bash
-BUNDLENAME=/sysroot/etc/pki/tls/certs/ca-bundle.crt
-while [ -h $BUNDLENAME ]; do
-    BUNDLENAME=/sysroot/$(readlink $BUNDLENAME)
-done
-
-cat /etc/pki/tls/certs/ca-bundle.crt > $BUNDLENAME
-mkdir -p /sysroot/etc/confluent/
-cp -a /tls /sysroot/etc/confluent
-cp -a /etc/confluent/* /sysroot/etc/confluent/
-sed -i 's/install::/install:*:/' /sysroot/etc/shadow
-sed -i 's/root::/root:*:/' /sysroot/etc/shadow
-mkdir -p /sysroot/root/.ssh
-#chmod 700 /sysroot/root/.ssh
-cat /ssh/*pubkey > /sysroot/root/.ssh/authorized_keys
-#chmod 600 /sysroot/root/.ssh/authorized_keys
-mkdir -p /sysroot/etc/ssh/
-for i in /ssh/*.ca; do
-    echo '@cert-authority *' $(cat $i) >> /sysroot/etc/ssh/ssh_known_hosts
-done
-cp /opt/confluent/bin/apiclient /sysroot/etc/confluent
@@ -1,7 +0,0 @@
-#!/bin/sh
-sed -i 's/centos/CentOS/; s/rhel/Red Hat Enterprise Linux/' $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 && \
-ln -s $1/EFI/BOOT/BOOTX64.EFI $1/EFI/BOOT/grubx64.efi $2/boot/efi/boot/
-
@@ -1,80 +0,0 @@
-# In this OS profile, data is largely filled in during the %pre
-# phase, rather than the kickstart actually having the content.
-# None of the files shall be replaced during an upgrade in
-# /var/lib/confluent/public/os/<profile>, so customization should
-# be done by modifying files in /var/lib/confluent/public/os/<profile>
-
-# /tmp/rootpw will provide a 'rootpw' line, either locking password if not configured
-# or the crypted form.
-%include /tmp/rootpw
-
-# timezone is fetched from confluent server, which provides the
-# timezone that the management server itself is in by default.
-%include /tmp/timezone
-
-# similar to timezone, confluent is asked to provide the
-# deployment servers language info and replicate that
-# to the deployment target.
-%include /tmp/langinfo
-
-# bootloader may be specified if crypted.grubpassword is set on
-# a node. This will become a bootloader line if a password
-# was specified
-%include /tmp/grubpw
-
-# The default partition scheme is applied to a single drive, using
-# the getinstalldisk script to make a best guess as to the most
-# appropriate device. See pre.sh and getinstalldisk to customize
-# the automatic behavior, or comment out/delete the 
-# following line and provide your own manual partition plan
-# instead
-%include /tmp/partitioning
-
-reboot
-
-%packages
-chrony
-rsync
-python
-pciutils
-%include /tmp/addonpackages
-%end
-
-
-# A kickstart.custom file is provided to enable easily adding
-# kickstart content without modifying the stock file.
-# While the stock file may be safely modified, using the .custom
-# files may allow for more easily rebasing custom profiles to newer
-# stock profiles
-%include /tmp/kickstart.custom
-
-%pre
-profile=$(grep ^profile: /etc/confluent/confluent.deploycfg |awk '{print $2}')
-mgr=$(grep deploy_server /etc/confluent/confluent.deploycfg |awk '{print $2}')
-curl -f https://$mgr/confluent-public/os/$profile/scripts/pre.sh > /tmp/preinst.sh
-. /tmp/preinst.sh
-%end
-
-%post --nochroot
-mkdir -p /mnt/sysimage/etc/confluent
-profile=$(grep ^profile: /etc/confluent/confluent.deploycfg |awk '{print $2}')
-mgr=$(grep deploy_server /etc/confluent/confluent.deploycfg |awk '{print $2}')
-curl -f https://$mgr/confluent-public/os/$profile/scripts/prechroot.sh > /tmp/postinst.sh
-. /tmp/postinst.sh
-
-# Hook firstboot.sh
-curl -f https://$mgr/confluent-public/os/$profile/scripts/firstboot.service > /mnt/sysimage/etc/systemd/system/firstboot.service
-curl -f https://$mgr/confluent-public/os/$profile/scripts/firstboot.sh > /mnt/sysimage/etc/confluent/firstboot.sh
-chmod +x /mnt/sysimage/etc/confluent/firstboot.sh
-%end
-
-%post
-cat /etc/confluent/tls/*.pem >> /etc/pki/tls/certs/ca-bundle.crt
-systemctl enable firstboot
-chgrp ssh_keys /etc/ssh/ssh*key
-restorecon /etc/ssh/ssh*key /root/.shosts /etc/ssh/shosts.equiv /etc/ssh/ssh_config.d/* /etc/confluent/firstboot.sh
-profile=$(grep ^profile: /etc/confluent/confluent.deploycfg |awk '{print $2}')
-mgr=$(grep deploy_server /etc/confluent/confluent.deploycfg |awk '{print $2}')
-curl -f https://$mgr/confluent-public/os/$profile/scripts/post.sh > /tmp/postinst.sh
-. /tmp/postinst.sh
-%end
@@ -1,7 +0,0 @@
-# Any custom kickstart additions may go here.  It may be required to
-# modify base kickstart file to change certain portions, but adding
-# custom content to this file allows for most convenient way to 
-# refresh to a newer base profile if desired.
-# Two common example customizations are provided:
-#firewall --disabled
-#selinux --disabled
@@ -1,3 +0,0 @@
-label: %%DISTRO%% %%VERSION%% %%ARCH%% (Default Profile)
-kernelargs: quiet
-#installedargs: example # These arguments would be added to the installed system
@@ -1,43 +0,0 @@
-try:
-    import configparser
-except ImportError:
-    import ConfigParser as configparser
-    import cStringIO
-import imp
-import sys
-apiclient = imp.load_source('apiclient', '/etc/confluent/apiclient')
-repo = None
-server = 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:'):
-           _, server = line.split(' ', 1)
-        if line.startswith('profile: '):
-           _, profile = line.split(' ', 1)
-
-path = '/confluent-public/os/{0}/distribution/'.format(profile)
-clnt = apiclient.HTTPSClient()
-cfgdata = clnt.grab_url(path + '.treeinfo').decode()
-c = configparser.ConfigParser()
-try:
-    c.read_string(cfgdata)
-except AttributeError:
-    f = cStringIO.StringIO(cfgdata)
-    c.readfp(f)
-for sec in c.sections():
-    if sec.startswith('variant-'):
-        try:
-            repopath = c.get(sec, 'repository')
-        except Exception:
-            continue
-        _, varname = sec.split('-', 1)
-        reponame = '/etc/yum.repos.d/local-{0}.repo'.format(varname.lower())
-        with open(reponame, 'w') as repout:
-            repout.write('[local-{0}]\n'.format(varname.lower()))
-            repout.write('name=Local install repository for {0}\n'.format(varname))
-            if repopath[0] == '.':
-                repopath = repopath[1:]
-            repout.write('baseurl=https://{}/confluent-public/os/{}/distribution/{}\n'.format(server, profile, repopath))
-            repout.write('enabled=1\n')
@@ -1,4 +0,0 @@
-. /etc/confluent/functions
-# This is a convenient place to keep customizations separate from modifying the stock scripts
-# While modification of the stock scripts is fine, it may be easier to rebase to a newer
-# stock profile if the '.custom' files are used.
@@ -1,11 +0,0 @@
-[Unit]
-Description=First Boot Process
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-ExecStart=/etc/confluent/firstboot.sh
-
-[Install]
-WantedBy=multi-user.target
-
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# This script is executed on the first boot after install has
-# completed. It is best to edit the middle of the file as
-# noted below so custom commands are executed before
-# the script notifies confluent that install is fully complete.
-
-nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
-apikey=$(cat /etc/confluent/confluent.apikey)
-mgr=$(grep deploy_server /etc/confluent/confluent.deploycfg|awk '{print $2}')
-profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-cat /etc/confluent/tls/*.pem >> /etc/pki/tls/certs/ca-bundle.crt
-export nodename mgr profile
-. /etc/confluent/functions
-
-
-run_remote firstboot.custom
-
-
-curl -X POST -d 'status: complete' -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $apikey" https://$mgr/confluent-api/self/updatestatus
-systemctl disable firstboot
-rm /etc/systemd/system/firstboot.service
@@ -1,72 +0,0 @@
-function set_confluent_vars() {
-    if [ -z "$mgr" ]; then
-        mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg | sed -e 's/[^ ]*: //')
-    fi
-    if [ -z "$profile" ]; then
-        profile=$(grep ^profile: /etc/confluent/confluent.deploycfg | sed -e 's/[^ ]*: //')
-    fi
-}
-
-fetch_remote() {
-    if [ -f /etc/confluent/ca.pem ]; then
-        curlargs=" --cacert /etc/confluent/ca.pem"
-    fi
-    set_confluent_vars
-    mkdir -p $(dirname $1)
-    curl -f -sS $curlargs https://$mgr/confluent-public/os/$profile/scripts/$1 > $1
-    if [ $? != 0 ]; then echo $1 failed to download; return 1; fi
-}
-
-run_remote() {
-    requestedcmd="'$*'"
-    curlargs=""
-    if [ -f /etc/confluent/ca.pem ]; then
-        curlargs=" --cacert /etc/confluent/ca.pem"
-    fi
-    set_confluent_vars
-    echo
-    echo '---------------------------------------------------------------------------'
-    echo Running $requestedcmd from https://$mgr/confluent-public/os/$profile/scripts/
-    tmpdir=$(mktemp -d)
-    echo Executing in $tmpdir
-    cd $tmpdir
-    mkdir -p $(dirname $1)
-    curl -f -sS $curlargs https://$mgr/confluent-public/os/$profile/scripts/$1 > $1
-    if [ $? != 0 ]; then echo $requestedcmd failed to download; return 1; fi
-    chmod +x $1
-    cmd=$1
-    if [ -x /usr/bin/chcon ]; then
-        chcon system_u:object_r:bin_t:s0 $cmd
-    fi
-    shift
-    ./$cmd $*
-    retcode=$?
-    echo "$requestedcmd exited with code $retcode"
-    cd - > /dev/null
-    return $retcode
-}
-
-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://$mgr/confluent-public/os/$profile/scripts/
-    tmpdir=$(mktemp -d)
-    echo Executing in $tmpdir
-    cd $tmpdir
-    mkdir -p $(dirname $1)
-    curl -f -sS $curlargs https://$mgr/confluent-public/os/$profile/scripts/$1 > $1
-    if [ $? != 0 ]; then echo "'$*'" failed to download; return 1; fi
-    if [ -x /usr/libexec/platform-python ]; then
-        /usr/libexec/platform-python $*
-    else
-        /usr/bin/python $*
-    fi
-    retcode=$?
-    echo "'$*' exited with code $retcode"
-    cd - > /dev/null
-    return $retcode
-}
@@ -1,88 +0,0 @@
-import subprocess
-import os
-
-class DiskInfo(object):
-    def __init__(self, devname):
-        self.name = devname
-        self.wwn = None
-        self.path = None
-        self.model = ''
-        self.size = 0
-        self.driver = None
-        self.mdcontainer = ''
-        devnode = '/dev/{0}'.format(devname)
-        qprop = subprocess.check_output(
-            ['udevadm', 'info', '--query=property', devnode])
-        if not isinstance(qprop, str):
-            qprop = qprop.decode('utf8')
-        for prop in qprop.split('\n'):
-            if '=' not in prop:
-                continue
-            k, v = prop.split('=', 1)
-            if k == 'DEVTYPE' and v != 'disk':
-                raise Exception('Not a disk')
-            elif k == 'DM_NAME':
-                raise Exception('Device Mapper')
-            elif k == 'ID_MODEL':
-                self.model = v
-            elif k == 'DEVPATH':
-                self.path = v
-            elif k == 'ID_WWN':
-                self.wwn = v
-            elif k == 'MD_CONTAINER':
-                self.mdcontainer = v
-        attrs = subprocess.check_output(['udevadm', 'info', '-a', devnode])
-        if not isinstance(attrs, str):
-            attrs = attrs.decode('utf8')
-        for attr in attrs.split('\n'):
-            if '==' not in attr:
-                continue
-            k, v = attr.split('==', 1)
-            k = k.strip()
-            if k == 'ATTRS{size}':
-                self.size = v.replace('"', '')
-            elif (k == 'DRIVERS' and not self.driver
-                    and v not in ('"sd"', '""')):
-                self.driver = v.replace('"', '')
-        if not self.driver and 'imsm' not in self.mdcontainer:
-            raise Exception("No driver detected")
-
-    @property
-    def priority(self):
-        if self.model.lower() in ('thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
-            return 0
-        if 'imsm' in self.mdcontainer:
-            return 1
-        if self.driver == 'ahci':
-            return 2
-        if self.driver.startswith('megaraid'):
-            return 3
-        if self.driver.startswith('mpt'):
-            return 4
-        return 99
-
-    def __repr__(self):
-        return repr({
-            'name': self.name,
-            'path': self.path,
-            'wwn': self.wwn,
-            'driver': self.driver,
-            'size': self.size,
-            'model': self.model,
-        })
-
-
-def main():
-    disks = []
-    for disk in sorted(os.listdir('/sys/class/block')):
-        try:
-            disk = DiskInfo(disk)
-            disks.append(disk)
-        except Exception as e:
-            print("Skipping {0}: {1}".format(disk, str(e)))
-    nd = [x.name for x in sorted(disks, key=lambda x: x.priority)]
-    if nd:
-        open('/tmp/installdisk', 'w').write(nd[0])
-
-if __name__ == '__main__':
-    main()
@@ -1,19 +0,0 @@
-# To use this script, rename or copy the mofed image to either ofed.tgz or ofed.iso
-# and modify the script below if wanting to use the iso instead of tgz
-
-# It checks for mellanox devices and opts not to install, so this script could be added
-# to a general profile without causing mofed to install on non-mellanox systems
-. /etc/confluent/functions
-if lspci -d 15b3:: -n |grep 15b3 > /dev/null; then
-    # Uncomment the following three lines and comment out the next
-    # two lines to use the .iso instead of the tgz packaging
-    #fetch_remote infiniband/mofed.iso
-    #mkdir MLNX_OFED
-    #mount -o loop infiniband/mofed.iso MLNX_OFED
-    fetch_remote infiniband/mofed.tgz
-    tar xf infiniband/mofed.tgz
-    # The rest is common between tar and iso
-    cd MLNX_OFED*
-    ./mlnxofedinstall --force
-fi
-
@@ -1,10 +0,0 @@
-# Add needed base packages to the install
-cat << EOF >> /tmp/addonpackages
-perl
-pkgconf-pkg-config
-tcsh
-lsof
-tk
-gcc-gfortran
-tcl
-EOF
@@ -1,7 +0,0 @@
-. /etc/confluent/functions
-# This is a convenient place to keep customizations separate from modifying the stock scripts
-# While modification of the stock scripts is fine, it may be easier to rebase to a newer
-# stock profile if the '.custom' files are used.
-# An example for installing OFED for infiniband follows (see the file for more detail):
-#run_remote infiniband/mofed.post
-
@@ -1,39 +0,0 @@
-#!/bin/sh
-# need to copy over ssh key info
-nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
-apikey=$(cat /etc/confluent/confluent.apikey)
-
-chmod 700 /etc/confluent
-chmod og-rwx /etc/confluent/*
-
-export mgr profile nodename
-. /etc/confluent/functions
-
-curl -X POST -d 'status: staged' -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $apikey" https://$mgr/confluent-api/self/updatestatus
-
-
-if [ -f /tmp/cryptboot ]; then
-    run_remote tpm_luks.sh
-fi
-# By default, the install repository is ignored, change
-# this by manually adding local repositories
-
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-*
-run_remote_python add_local_repositories
-# This script will execute in the installed system, but using the installer kernel prior to reboot.
-# This is an appropriate place to run post install activities that do not require the actual installed
-# kernel to run. For example adding drivers that would be needed for first boot to run cleanly.
-# If, for example, there is a post script that has a dependency on a driver or filesystem that
-# cannot work until booting into the installer, use firstboot.sh instead
-
-# run_remote will download and execute from /var/lib/confluent/public/os/<profile>/scripts/ directory
-# run_remote_python will use the appropriate python interpreter path to run the specified script
-# A post.custom is provided to more conveniently hold customizations, see the post.custom file.
-
-# This will induce server side processing of the syncfile contents if
-# present
-run_remote_python syncfileclient
-
-# run_remote example.sh
-# run_remote_python example.py
-run_remote post.custom
@@ -1,14 +0,0 @@
-. /tmp/functions
-# This is a convenient place to keep customizations separate from modifying the stock scripts
-# While modification of the stock scripts is fine, it may be easier to rebase to a newer
-# stock profile if the '.custom' files are used.
-#
-#Here is an example to locally configure the platform BMC according
-#to confluent configuration so that the BMC would be on the correct
-#network:
-#run_remote_python configbmc -c
-
-#Some addons improve efficiency by adding dependencies during install
-#here is an example for adding OFED install prereqs to the install
-#run_remote infiniband/mofed.pre
-
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-# This runs prior to the installer beginning. This is used to rewrite the 
-# scripted install file, merging data from confluent and identifying
-# the most appropriate install source.
-
-# If you want to use a more custom partition plan, the easiest
-# method is to edit the kicktstart file and comment out or
-# delete %include /tmp/partitioning
-
-nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
-locale=$(grep ^locale: /etc/confluent/confluent.deploycfg)
-locale=${locale#locale: }
-keymap=$(grep ^keymap: /etc/confluent/confluent.deploycfg)
-keymap=${keymap#keymap: }
-echo lang $locale > /tmp/langinfo
-echo keyboard --vckeymap=$keymap >> /tmp/langinfo
-tz=$(grep ^timezone: /etc/confluent/confluent.deploycfg)
-tz=${tz#timezone: }
-ntpsrvs=""
-if grep ^ntpservers: /etc/confluent/confluent.deploycfg > /dev/null; then
-    ntpsrvs="--ntpservers="$(sed -n '/^ntpservers:/,/^[^-]/p' /etc/confluent/confluent.deploycfg|sed 1d|sed '$d' | sed -e 's/^- //' | paste -sd,)
-fi
-echo timezone $ntpsrvs $tz --utc > /tmp/timezone
-rootpw=$(grep ^rootpassword /etc/confluent/confluent.deploycfg | awk '{print $2}')
-if [ "$rootpw" = null ]; then
-    echo "rootpw --lock" > /tmp/rootpw
-else
-    echo "rootpw --iscrypted $rootpw" > /tmp/rootpw
-fi
-curl -f https://$mgr/confluent-public/os/$profile/profile.yaml > /tmp/instprofile.yaml
-blargs=$(grep ^installedargs: /tmp/instprofile.yaml | sed -e 's/#.*//' -e 's/^installedargs: //')
-if [ ! -z "$blargs" ]; then
-	blargs=' --append="'$blargs'"'
-fi
-grubpw=$(grep ^grubpassword /etc/confluent/confluent.deploycfg | awk '{print $2}')
-if [ "$grubpw" = "null" ]; then
-    touch /tmp/grubpw
-else
-    blargs=" --iscrypted --password=$grubpw $blargs"
-fi
-if [ ! -z "$blargs" ]; then
-    echo "bootloader $blargs" > /tmp/grubpw
-fi
-ssh-keygen -A
-for pubkey in /etc/ssh/ssh_host_*_key.pub; do
-    certfile=${pubkey/.pub/-cert.pub}
-    curl -f -X POST -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" -d @$pubkey https://$mgr/confluent-api/self/sshcert > $certfile
-    echo HostCertificate $certfile >> /etc/ssh/sshd_config.anaconda
-done
-/usr/sbin/sshd -f /etc/ssh/sshd_config.anaconda
-if [ -f "/run/install/cmdline.d/01-autocons.conf" ]; then
-    consoledev=$(cat /run/install/cmdline.d/01-autocons.conf | sed -e 's!console=!/dev/!' -e 's/,.*//')
-    TMUX= tmux a <> $consoledev >&0 2>&1 &
-fi
-touch /tmp/addonpackages
-cryptboot=$(grep ^encryptboot: /etc/confluent/confluent.deploycfg | awk '{print $2}')
-LUKSPARTY=''
-if [ "$cryptboot" == "tpm2" ]; then
-	LUKSPARTY="--encrypted --passphrase=$(cat /etc/confluent/confluent.apikey)"
-	echo $cryptboot >> /tmp/cryptboot
-fi
-
-
-export mgr profile nodename
-curl -f https://$mgr/confluent-public/os/$profile/scripts/functions > /tmp/functions
-. /tmp/functions
-run_remote_python getinstalldisk
-if [ -e /tmp/installdisk ]; then
-    echo clearpart --all --initlabel >> /tmp/partitioning
-    echo ignoredisk --only-use $(cat /tmp/installdisk) >> /tmp/partitioning
-    echo autopart --nohome $LUKSPARTY >> /tmp/partitioning
-fi
-python /etc/confluent/apiclient /confluent-public/os/$profile/kickstart.custom -o /tmp/kickstart.custom
-run_remote pre.custom
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# This script runs after install is complete, but inside the installer 
-# environment. This is useful for carrying work done in pre/during the
-# installer into the installed environment.
-
-# It is almost certainly more useful to use post.sh or firstboot.sh
-# for customization, which will run in a more normal mechanism
-
-nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
-export mgr profile nodename
-cp -a /etc/confluent /mnt/sysimage/etc
-cp /tmp/functions /mnt/sysimage/etc/confluent/
-. /tmp/functions
-cp /tmp/cryptboot /mnt/sysimage/tmp/
-
-# Preserve the ssh setup work done for the installer
-# by copying into the target system and setting up
-# host based authentication
-run_remote setupssh.sh
@@ -1,23 +0,0 @@
-#!/bin/sh
-grep HostCert /etc/ssh/sshd_config.anaconda >> /mnt/sysimage/etc/ssh/sshd_config
-echo HostbasedAuthentication yes >> /mnt/sysimage/etc/ssh/sshd_config
-echo HostbasedUsesNameFromPacketOnly yes >> /mnt/sysimage/etc/ssh/sshd_config
-echo IgnoreRhosts no >> /mnt/sysimage/etc/ssh/sshd_config
-sshconf=/mnt/sysimage/etc/ssh/ssh_config
-if [ -d /mnt/sysimage/etc/ssh/ssh_config.d/ ]; then
-    sshconf=/mnt/sysimage/etc/ssh/ssh_config.d/01-confluent.conf
-fi
-echo 'Host *' >> $sshconf
-echo '    HostbasedAuthentication yes' >> $sshconf
-echo '    EnableSSHKeysign yes' >> $sshconf
-echo '    HostbasedKeyTypes *ed25519*' >> $sshconf
-
-cp /etc/ssh/ssh_host_* /mnt/sysimage/etc/ssh/
-mkdir /mnt/sysimage/root/.ssh/
-chmod 700 /mnt/sysimage/root/.ssh/
-cp /root/.ssh/authorized_keys /mnt/sysimage/root/.ssh/
-chmod 600 /mnt/sysimage/root/.ssh/authorized_keys
-cp /etc/ssh/ssh_known_hosts /mnt/sysimage/etc/ssh/
-curl -f -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" https://$mgr/confluent-api/self/nodelist > /tmp/allnodes
-cp /tmp/allnodes /mnt/sysimage/etc/ssh/shosts.equiv
-cp /tmp/allnodes /mnt/sysimage/root/.shosts
@@ -1,219 +0,0 @@
-#!/usr/bin/python
-import importlib
-import tempfile
-import json
-import os
-import shutil
-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:
-    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]
-        while not self.sourcelines[-1]:
-            self.sourcelines = self.sourcelines[:-1]
-        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 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 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 synchronize():
-    tmpdir = tempfile.mkdtemp()
-    try:
-        ac = apiclient.HTTPSClient()
-        data = json.dumps({'merge': tmpdir})
-        status, rsp = ac.grab_url_with_status('/confluent-api/self/remotesyncfiles', data)
-        if status == 202:
-            while status != 204:
-                status, rsp = ac.grab_url_with_status('/confluent-api/self/remotesyncfiles')
-                if not isinstance(rsp, str):
-                    rsp = rsp.decode('utf8')
-            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')
-    finally:
-        shutil.rmtree(tmpdir)
-
-
-if __name__ == '__main__':
-    synchronize()
@@ -1,4 +0,0 @@
-#!/bin/sh
-cryptdisk=$(blkid -t TYPE="crypto_LUKS"|sed -e s/:.*//)
-clevis luks bind -f -d $cryptdisk -k - tpm2 '{}' < /etc/confluent/confluent.apikey
-cryptsetup luksRemoveKey $cryptdisk < /etc/confluent/confluent.apikey
@@ -1,18 +0,0 @@
-#!/bin/bash
-echo -n "" >> /tmp/net.ifaces
-cat /tls/*.0 >> /etc/pki/tls/certs/ca-bundle.crt
-if ! grep console= /proc/cmdline >& /dev/null; then
-    autocons=$(/opt/confluent/bin/autocons)
-    if [ -n "$autocons" ]; then
-        echo console=$autocons |sed -e 's!/dev/!!' >> /tmp/01-autocons.conf
-        autocons=${autocons%,*}
-	echo $autocons > /tmp/01-autocons.devnode
-	echo "Detected firmware specified console at $(cat /tmp/01-autocons.conf)" > $autocons
-        echo "Initializing auto detected console when installer starts" > $autocons
-    fi
-fi
-if grep console=ttyS /proc/cmdline >& /dev/null; then
-    echo "Serial console has been requested in the kernel arguments, the local video may not show progress" > /dev/tty1
-fi
-. /lib/anaconda-lib.sh
-wait_for_kickstart
@@ -1,121 +0,0 @@
-#!/bin/sh
-[ -e /tmp/confluent.initq ] && return 0
-if [ -f /tmp/dd_disk ]; then
-    for dd in $(cat /tmp/dd_disk); do
-        if [ -e $dd ]; then
-            driver-updates --disk $dd $dd
-        fi
-    done
-fi
-vlaninfo=$(getarg vlan)
-if [ ! -z "$vlaninfo" ]; then
-        vldev=${vlaninfo#*:}
-        vlid=${vlaninfo#*.}
-        vlid=${vlid%:*}
-        ip link add link $vldev name $vldev.$vlid type vlan id $vlid
-fi
-TRIES=0
-oum=$(umask)
-umask 0077
-mkdir -p /etc/confluent
-echo -n > /etc/confluent/confluent.info
-umask $oum
-cd /sys/class/net
-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
-        ip link set $currif up
-    done
-    /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
-
-nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
-#TODO: blkid --label <whatever> to find mounted api
-
-cat /tls/*.pem > /etc/confluent/ca.pem
-/usr/libexec/platform-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%:}
-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
-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)
-proto=${proto#protocol: }
-textconsole=$(grep ^textconsole: /etc/confluent/confluent.deploycfg)
-textconsole=${textconsole#textconsole: }
-if [ "$textconsole" = "true" ] && ! grep console= /proc/cmdline > /dev/null; then
-	autocons=$(cat /tmp/01-autocons.devnode)
-	if [ ! -z "$autocons" ]; then
-	    echo Auto-configuring installed system to use text console
-	    echo Auto-configuring installed system to use text console > $autocons
-	    cp /tmp/01-autocons.conf /etc/cmdline.d/
-	else
-	    echo "Unable to automatically detect requested text console"
-	fi
-fi
-
-echo inst.repo=$proto://$mgr/confluent-public/os/$profilename/distribution >> /etc/cmdline.d/01-confluent.conf
-echo inst.ks=$proto://$mgr/confluent-public/os/$profilename/kickstart >> /etc/cmdline.d/01-confluent.conf
-kickstart=$proto://$mgr/confluent-public/os/$profilename/kickstart
-root=anaconda-net:$proto://$mgr/confluent-public/os/$profilename/distribution
-export kickstart
-export root
-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
-    if [ $nameserversec = 1 ]; then
-        if [[ $entry == "-"* ]] && [[ $entry != "- ''" ]]; then
-            echo nameserver=${entry#- } >> /etc/cmdline.d/01-confluent.conf
-            continue
-        fi
-    fi
-    nameserversec=0
-    if [ "${entry%:*}" = "nameservers" ]; then
-        nameserversec=1
-        continue
-    fi
-done < /etc/confluent/confluent.deploycfg
-if [ -e /lib/nm-lib.sh ]; then
-    . /lib/nm-lib.sh
-    nm_generate_connections
-    if [[ "$ifname" == ib* ]]; then
-        sed -i s/type=ethernet/type=infiniband/ /run/NetworkManager/system-connections/$ifname.nmconnection
-        if ! grep '\[infiniband\]' /run/NetworkManager/system-connections/$ifname.nmconnection > /dev/null; then
-            echo >> /run/NetworkManager/system-connections/$ifname.nmconnection
-            echo '[infiniband]' >> /run/NetworkManager/system-connections/$ifname.nmconnection
-            echo transport-mode=datagram >> /run/NetworkManager/system-connections/$ifname.nmconnection
-        fi
-    fi
-fi
-
@@ -1,22 +0,0 @@
-#!/bin/bash
-BUNDLENAME=/sysroot/etc/pki/tls/certs/ca-bundle.crt
-while [ -h $BUNDLENAME ]; do
-    BUNDLENAME=/sysroot/$(readlink $BUNDLENAME)
-done
-
-cat /etc/pki/tls/certs/ca-bundle.crt > $BUNDLENAME
-mkdir -p /sysroot/etc/confluent/
-chmod 700 /sysroot/etc/confluent
-cp -a /tls /sysroot/etc/confluent
-cp /etc/confluent/* /sysroot/etc/confluent
-sed -i 's/install::/install:*:/' /sysroot/etc/shadow
-sed -i 's/root::/root:*:/' /sysroot/etc/shadow
-mkdir -p /sysroot/root/.ssh
-chmod 700 /sysroot/root/.ssh
-cat /ssh/*pubkey > /sysroot/root/.ssh/authorized_keys
-chmod 600 /sysroot/root/.ssh/authorized_keys
-mkdir -p /sysroot/etc/ssh/
-for i in /ssh/*.ca; do
-    echo '@cert-authority *' $(cat $i) >> /sysroot/etc/ssh/ssh_known_hosts
-done
-cp /opt/confluent/bin/apiclient /sysroot/etc/confluent
@@ -1,25 +0,0 @@
-Ansible playbooks ending in .yml or .yaml that are placed into this directory will be executed at the
-appropriate phase of the install process.
-
-The 'hosts' may be omitted, and if included will be ignored, replaced with the host that is specifically
-requesting the playbooks be executed.
-
-Also, the playbooks will be executed on the deployment server. Hence it may be slower in aggregate than
-running content under scripts/ which ask much less of the deployment server
-
-Here is an example of what a playbook would look like broadly:
-
- name: Example
-  gather_facts: no
-  tasks:
-       - name: Example1
-         lineinfile:
-           path: /etc/hosts
-           line: 1.2.3.4 test1
-           create: yes
-       - name: Example2
-         lineinfile:
-           path: /etc/hosts
-           line: 1.2.3.5 test2
-           create: yes
-
@@ -1,25 +0,0 @@
-Ansible playbooks ending in .yml or .yaml that are placed into this directory will be executed at the
-appropriate phase of the install process.
-
-The 'hosts' may be omitted, and if included will be ignored, replaced with the host that is specifically
-requesting the playbooks be executed.
-
-Also, the playbooks will be executed on the deployment server. Hence it may be slower in aggregate than
-running content under scripts/ which ask much less of the deployment server
-
-Here is an example of what a playbook would look like broadly:
-
- name: Example
-  gather_facts: no
-  tasks:
-       - name: Example1
-         lineinfile:
-           path: /etc/hosts
-           line: 1.2.3.4 test1
-           create: yes
-       - name: Example2
-         lineinfile:
-           path: /etc/hosts
-           line: 1.2.3.5 test2
-           create: yes
-
@@ -1,7 +0,0 @@
-#!/bin/sh
-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 && \
-ln -s $1/EFI/BOOT/BOOTX64.EFI $1/EFI/BOOT/grubx64.efi $2/boot/efi/boot/
-
@@ -1,84 +0,0 @@
-# In this OS profile, data is largely filled in during the %pre
-# phase, rather than the kickstart actually having the content.
-# None of the files shall be replaced during an upgrade in
-# /var/lib/confluent/public/os/<profile>, so customization should
-# be done by modifying files in /var/lib/confluent/public/os/<profile>
-
-# /tmp/rootpw will provide a 'rootpw' line, either locking password if not configured
-# or the crypted form.
-%include /tmp/rootpw
-
-# timezone is fetched from confluent server, which provides the
-# timezone that the management server itself is in by default.
-%include /tmp/timezone
-
-# similar to timezone, confluent is asked to provide the
-# deployment servers language info and replicate that
-# to the deployment target.
-%include /tmp/langinfo
-
-# bootloader may be specified if crypted.grubpassword is set on
-# a node. This will become a bootloader line if a password
-# was specified
-%include /tmp/grubpw
-
-# The default partition scheme is applied to a single drive, using
-# the getinstalldisk script to make a best guess as to the most
-# appropriate device. See pre.sh and getinstalldisk to customize
-# the automatic behavior, or comment out/delete the 
-# following line and provide your own manual partition plan
-# instead
-%include /tmp/partitioning
-
-reboot
-
-%packages
-@^minimal-environment
-#-kernel-uek # This can opt out of the UEK for the relevant distribution
-chrony
-rsync
-python3
-tar
-pciutils
-%include /tmp/addonpackages
-%include /tmp/cryptpkglist
-%end
-
-# A kickstart.custom file is provided to enable easily adding
-# kickstart content without modifying the stock file.
-# While the stock file may be safely modified, using the .custom
-# files may allow for more easily rebasing custom profiles to newer
-# stock profiles
-%include /tmp/kickstart.custom
-
-%pre
-profile=$(grep ^profile: /etc/confluent/confluent.deploycfg |awk '{print $2}')
-mgr=$(grep deploy_server /etc/confluent/confluent.deploycfg |awk '{print $2}')
-curl -f https://$mgr/confluent-public/os/$profile/scripts/pre.sh > /tmp/preinst.sh
-. /tmp/preinst.sh
-%end
-
-%post --nochroot
-mkdir -p /mnt/sysimage/etc/confluent
-profile=$(grep ^profile: /etc/confluent/confluent.deploycfg |awk '{print $2}')
-mgr=$(grep deploy_server /etc/confluent/confluent.deploycfg |awk '{print $2}')
-curl -f https://$mgr/confluent-public/os/$profile/scripts/prechroot.sh > /tmp/postinst.sh
-. /tmp/postinst.sh
-
-# Hook firstboot.sh
-curl -f https://$mgr/confluent-public/os/$profile/scripts/firstboot.service > /mnt/sysimage/etc/systemd/system/firstboot.service
-mkdir -p /mnt/sysimage/opt/confluent/bin
-curl -f https://$mgr/confluent-public/os/$profile/scripts/firstboot.sh > /mnt/sysimage/opt/confluent/bin/firstboot.sh
-chmod +x /mnt/sysimage/opt/confluent/bin/firstboot.sh
-%end
-
-%post
-cat /etc/confluent/tls/*.pem >> /etc/pki/tls/certs/ca-bundle.crt
-systemctl enable firstboot
-chgrp ssh_keys /etc/ssh/ssh*key
-restorecon /etc/ssh/ssh*key /root/.shosts /etc/ssh/shosts.equiv /etc/ssh/ssh_config.d/* /opt/confluent/bin/firstboot.sh
-profile=$(grep ^profile: /etc/confluent/confluent.deploycfg |awk '{print $2}')
-mgr=$(grep deploy_server /etc/confluent/confluent.deploycfg |awk '{print $2}')
-curl -f https://$mgr/confluent-public/os/$profile/scripts/post.sh > /tmp/postinst.sh
-. /tmp/postinst.sh
-%end
@@ -1,7 +0,0 @@
-# Any custom kickstart additions may go here.  It may be required to
-# modify base kickstart file to change certain portions, but adding
-# custom content to this file allows for most convenient way to 
-# refresh to a newer base profile if desired.
-# Two common example customizations are provided:
-#firewall --disabled
-#selinux --disabled
@@ -1,3 +0,0 @@
-label: %%DISTRO%% %%VERSION%% %%ARCH%% (Default Profile)
-kernelargs: quiet  # These arguments are passed to the installer
-#installedargs: example # These arguments would be added to the installed system
@@ -1,43 +0,0 @@
-try:
-    import configparser
-except ImportError:
-    import ConfigParser as configparser
-    import cStringIO
-import imp
-import sys
-apiclient = imp.load_source('apiclient', '/etc/confluent/apiclient')
-repo = None
-server = 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:'):
-           _, server = line.split(' ', 1)
-        if line.startswith('profile: '):
-           _, profile = line.split(' ', 1)
-
-path = '/confluent-public/os/{0}/distribution/'.format(profile)
-clnt = apiclient.HTTPSClient()
-cfgdata = clnt.grab_url(path + '.treeinfo').decode()
-c = configparser.ConfigParser()
-try:
-    c.read_string(cfgdata)
-except AttributeError:
-    f = cStringIO.StringIO(cfgdata)
-    c.readfp(f)
-for sec in c.sections():
-    if sec.startswith('variant-'):
-        try:
-            repopath = c.get(sec, 'repository')
-        except Exception:
-            continue
-        _, varname = sec.split('-', 1)
-        reponame = '/etc/yum.repos.d/local-{0}.repo'.format(varname.lower())
-        with open(reponame, 'w') as repout:
-            repout.write('[local-{0}]\n'.format(varname.lower()))
-            repout.write('name=Local install repository for {0}\n'.format(varname))
-            if repopath[0] == '.':
-                repopath = repopath[1:]
-            repout.write('baseurl=https://{}/confluent-public/os/{}/distribution/{}\n'.format(server, profile, repopath))
-            repout.write('enabled=1\n')
@@ -1,414 +0,0 @@
-# Copyright 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.
-
-import argparse
-import ctypes
-import fcntl
-import json
-from select import select
-import socket
-import struct
-import os
-import subprocess
-import sys
-import time
-
-if os.path.exists('/opt/confluent/bin/apiclient'):
-    apiclient = '/opt/confluent/bin/apiclient'
-elif os.path.exists('/etc/confluent/apiclient'):
-    apiclient = '/etc/confluent/apiclient'
-
-class IpmiMsg(ctypes.Structure):
-    _fields_ = [('netfn', ctypes.c_ubyte),
-                ('cmd', ctypes.c_ubyte),
-                ('data_len', ctypes.c_short),
-                ('data', ctypes.POINTER(ctypes.c_ubyte))]
-
-
-class IpmiSystemInterfaceAddr(ctypes.Structure):
-    _fields_ = [('addr_type', ctypes.c_int),
-                ('channel', ctypes.c_short),
-                ('lun', ctypes.c_ubyte)]
-
-
-class IpmiRecv(ctypes.Structure):
-    _fields_ = [('recv_type', ctypes.c_int),
-                ('addr', ctypes.POINTER(IpmiSystemInterfaceAddr)),
-                ('addr_len', ctypes.c_uint),
-                ('msgid', ctypes.c_long),
-                ('msg', IpmiMsg)]
-
-
-class IpmiReq(ctypes.Structure):
-    _fields_ = [('addr', ctypes.POINTER(IpmiSystemInterfaceAddr)),
-                ('addr_len', ctypes.c_uint),
-                ('msgid', ctypes.c_long),
-                ('msg', IpmiMsg)]
-
-
-_IONONE = 0
-_IOWRITE = 1
-_IOREAD = 2
-IPMICTL_SET_MY_ADDRESS_CMD = (
-    _IOREAD << 30 | ctypes.sizeof(ctypes.c_uint) << 16
-    | ord('i') << 8 | 17)  # from ipmi.h
-IPMICTL_SEND_COMMAND = (
-    _IOREAD << 30 | ctypes.sizeof(IpmiReq) << 16
-    | ord('i') << 8 | 13)  # from ipmi.h
-# next is really IPMICTL_RECEIVE_MSG_TRUNC, but will only use that
-IPMICTL_RECV = (
-    (_IOWRITE | _IOREAD) << 30 | ctypes.sizeof(IpmiRecv) << 16
-    | ord('i') << 8 | 11)  # from ipmi.h
-BMC_SLAVE_ADDR = ctypes.c_uint(0x20)
-CURRCHAN = 0xf
-ADDRTYPE = 0xc
-
-
-class Session(object):
-    def __init__(self, devnode='/dev/ipmi0'):
-        """Create a local session inband
-
-        :param: devnode: The path to the ipmi device
-        """
-        self.ipmidev = open(devnode, 'r+')
-        fcntl.ioctl(self.ipmidev, IPMICTL_SET_MY_ADDRESS_CMD, BMC_SLAVE_ADDR)
-        # the interface is initted, create some reusable memory for our session
-        self.databuffer = ctypes.create_string_buffer(4096)
-        self.req = IpmiReq()
-        self.rsp = IpmiRecv()
-        self.addr = IpmiSystemInterfaceAddr()
-        self.req.msg.data = ctypes.cast(
-            ctypes.addressof(self.databuffer),
-            ctypes.POINTER(ctypes.c_ubyte))
-        self.rsp.msg.data = self.req.msg.data
-        self.userid = None
-        self.password = None
-
-    def await_reply(self):
-        rd, _, _ = select((self.ipmidev,), (), (), 1)
-        while not rd:
-            rd, _, _ = select((self.ipmidev,), (), (), 1)
-
-    def pause(self, seconds):
-        time.sleep(seconds)
-
-    @property
-    def parsed_rsp(self):
-        response = {'netfn': self.rsp.msg.netfn, 'command': self.rsp.msg.cmd,
-                    'code': bytearray(self.databuffer.raw)[0],
-                    'data': bytearray(
-                        self.databuffer.raw[1:self.rsp.msg.data_len])}
-        return response
-
-    def await_config(s, bmccfg, channel):
-        vlan = bmccfg.get('bmcvlan', None)
-        ipv4 = bmccfg.get('bmcipv4', None)
-        prefix = bmccfg.get('prefixv4', None)
-        gw = bmccfg.get('bmcgw', None)
-
-
-
-    def raw_command(self,
-                    netfn,
-                    command,
-                    data=(),
-                    bridge_request=None,
-                    retry=True,
-                    delay_xmit=None,
-                    timeout=None,
-                    waitall=False, rslun=0):
-        self.addr.channel = CURRCHAN
-        self.addr.addr_type = ADDRTYPE
-        self.addr.lun = rslun
-        self.req.addr_len = ctypes.sizeof(IpmiSystemInterfaceAddr)
-        self.req.addr = ctypes.pointer(self.addr)
-        self.req.msg.netfn = netfn
-        self.req.msg.cmd = command
-        if data:
-            data = memoryview(bytearray(data))
-            try:
-                self.databuffer[:len(data)] = data[:len(data)]
-            except ValueError:
-                self.databuffer[:len(data)] = data[:len(data)].tobytes()
-        self.req.msg.data_len = len(data)
-        fcntl.ioctl(self.ipmidev, IPMICTL_SEND_COMMAND, self.req)
-        self.await_reply()
-        self.rsp.msg.data_len = 4096
-        self.rsp.addr = ctypes.pointer(self.addr)
-        self.rsp.addr_len = ctypes.sizeof(IpmiSystemInterfaceAddr)
-        fcntl.ioctl(self.ipmidev, IPMICTL_RECV, self.rsp)
-        return self.parsed_rsp
-
-
-def _is_tsm(model):
-    return model in ('7y00', '7z01', '7y98', '7y99')
-
-def set_port(s, port, vendor, model):
-    oport = port
-    if vendor not in ('IBM', 'Lenovo'):
-        raise Exception('{0} not implemented'.format(vendor))
-    if _is_tsm(model):
-        return set_port_tsm(s, port, model)
-    else:
-        set_port_xcc(s, port, model)
-        return 1
-
-
-def set_port_tsm(s, port, model):
-    oport = port
-    sys.stdout.write('Setting TSM port to "{}"...'.format(oport))
-    sys.stdout.flush()
-    if port == 'ocp':
-        s.raw_command(0x32, 0x71, b'\x00\x01\x00')
-    elif port == 'dedicated':
-        s.raw_command(0x32, 0x71, b'\x00\x00\x00')
-    else:
-        raise Exception("Unsupported port for TSM")
-    timer = 15
-    while timer:
-        timer = timer - 1
-        time.sleep(1.0)
-        sys.stdout.write('.')
-        sys.stdout.flush()
-    if port == 'ocp':
-        iface = 0
-        s.raw_command(0x32, 0x71, b'\x00\x00\x03')
-    elif port == 'dedicated':
-        iface = 1
-        s.raw_command(0x32, 0x71, b'\x00\x01\x03')
-    rsp = s.raw_command(0x32, 0x72, bytearray([4, iface, 0]))
-    print('Complete')
-    return int(rsp['data'][0])
-
-
-def set_port_xcc(s, port, model):
-    oport = port
-    if port.lower() == 'dedicated':
-        port = b'\x01'
-    elif port.lower() in ('ml2', 'ocp'):
-        port = b'\x02\x00'
-    elif port.lower() == 'lom':
-        if model == '7x58':
-            port = b'\x00\x02'
-        else:
-            port = b'\x00\x00'
-    else:
-        port = port.split(' ')
-        port = bytes(bytearray([int(x) for x in port]))
-    currport = bytes(s.raw_command(0xc, 2, b'\x01\xc0\x00\x00')['data'][1:])
-    if port == currport:
-        sys.stdout.write('XCC port already set to "{}"\n'.format(oport))
-        return
-    sys.stdout.write('Setting XCC port to "{}"...'.format(oport))
-    sys.stdout.flush()
-    s.raw_command(0xc, 1, b'\x01\xc0' + port)
-    tries = 60
-    while currport != port and tries:
-        tries -= 1
-        time.sleep(0.5)
-        sys.stdout.write('.')
-        sys.stdout.flush()
-        currport = bytes(s.raw_command(0xc, 2, b'\x01\xc0\x00\x00')['data'][1:])
-    if not tries:
-        raise Exception('Timeout attempting to set port')
-    sys.stdout.write('Complete\n')
-
-
-def check_vlan(s, vlan, channel):
-    if vlan == 'off':
-        vlan = b'\x00\x00'
-    else:
-        vlan = int(vlan)
-        if vlan:
-            vlan = vlan | 32768
-        vlan = struct.pack('<H', vlan)
-    currvlan = bytes(s.raw_command(0xc, 2, bytearray([channel, 0x14 ,0, 0]))['data'][1:])
-    if bytearray(currvlan)[1] & 0b10000000 == 0:
-        currvlan = b'\x00\x00'
-    return currvlan == vlan
-
-
-def set_vlan(s, vlan, channel):
-    ovlan = vlan
-    if vlan == 'off':
-        vlan = b'\x00\x00'
-    else:
-        vlan = int(vlan)
-        if vlan:
-            vlan = vlan | 32768
-        vlan = struct.pack('<H', vlan)
-    if check_vlan(s, ovlan, channel):
-        sys.stdout.write('VLAN already configured to "{0}"\n'.format(ovlan))
-        return False
-    rsp = s.raw_command(0xc, 1, bytearray([channel, 0x14]) + vlan)
-    if rsp.get('code', 1) == 0:
-        print('VLAN configured to "{}"'.format(ovlan))
-    else:
-        print('Error setting vlan: ' + repr(rsp))
-    return True
-
-
-def get_lan_channel(s):
-    for chan in range(1, 16):
-        rsp = s.raw_command(6, 0x42, bytearray([chan]))['data']
-        if not rsp:
-            continue
-        medtype = int(rsp[1]) & 0b1111111
-        if medtype not in (4, 6):
-            continue
-        rsp = s.raw_command(0xc, 2, bytearray([2, chan, 5, 0, 0]))
-        if rsp.get('code', 1) == 0:
-            return chan
-    return 1
-
-
-def check_ipv4(s, ipaddr, channel):
-    ipaddr = bytearray(socket.inet_aton(ipaddr))
-    rsp = s.raw_command(0xc, 2, bytearray([channel, 3, 0, 0]))['data'][-4:]
-    return rsp == ipaddr
-
-def set_ipv4(s, ipaddr, channel):
-    oipaddr = ipaddr
-    ipaddr = bytearray(socket.inet_aton(ipaddr))
-    if check_ipv4(s, oipaddr, channel):
-        print('IP Address already set to {}'.format(oipaddr))
-        return False
-    rsp = int(s.raw_command(0xc, 2, bytearray([channel, 4, 0, 0]))['data'][1]) & 0b1111
-    if rsp != 1:
-        sys.stdout.write("Changing configuration to static...")
-        sys.stdout.flush()
-        resp = s.raw_command(0xc, 1, bytearray([channel, 4, 1]))
-        tries = 0
-        while rsp != 1 and tries < 30:
-            sys.stdout.write('.')
-            sys.stdout.flush()
-            tries += 1
-            time.sleep(0.5)
-            rsp = int(s.raw_command(0xc, 2, bytearray([channel, 4, 0, 0]))['data'][1]) & 0b1111
-        sys.stdout.write('Complete\n')
-        sys.stdout.flush()
-    print('Setting IP to {}'.format(oipaddr))
-    s.raw_command(0xc, 1, bytearray([channel, 3]) + ipaddr)
-    return True
-
-
-def check_subnet(s, prefix, channel):
-    prefix = int(prefix)
-    mask = bytearray(struct.pack('!I', (2**32 - 1) ^ (2**(32 - prefix) - 1)))
-    rsp = s.raw_command(0xc, 2, bytearray([channel, 6, 0, 0]))['data'][-4:]
-    return rsp == mask
-
-def set_subnet(s, prefix, channel):
-    oprefix = prefix
-    prefix = int(prefix)
-    mask = bytearray(struct.pack('!I', (2**32 - 1) ^ (2**(32 - prefix) - 1)))
-    if check_subnet(s, prefix, channel):
-        print('Subnet Mask already set to /{}'.format(oprefix))
-        return False
-    print('Setting subnet mask to /{}'.format(oprefix))
-    s.raw_command(0xc, 1, bytearray([channel, 6]) + mask)
-    return True
-
-
-def check_gateway(s, gw, channel):
-    gw = bytearray(socket.inet_aton(gw))
-    rsp = s.raw_command(0xc, 2, bytearray([channel, 12, 0, 0]))['data'][-4:]
-    return rsp == gw
-
-def set_gateway(s, gw, channel):
-    ogw = gw
-    gw = bytearray(socket.inet_aton(gw))
-    rsp = s.raw_command(0xc, 2, bytearray([channel, 12, 0, 0]))['data'][-4:]
-    if check_gateway(s, ogw, channel):
-        print('Gateway already set to {}'.format(ogw))
-        return False
-    print('Setting gateway to {}'.format(ogw))
-    s.raw_command(0xc, 1, bytearray([channel, 12]) + gw)
-    return True
-
-def dotwait():
-    sys.stdout.write('.')
-    sys.stdout.flush()
-    time.sleep(0.5)
-
-def main():
-    a = argparse.ArgumentParser(description='Locally configure a BMC device')
-    a.add_argument('-v', help='vlan id or off to disable vlan tagging')
-    a.add_argument('-p', help='Which port to use (dedicated, lom, ocp, ml2)')
-    a.add_argument('-i', help='JSON configuration file to read for '
-                   'configuration')
-    a.add_argument('-c', help='Use Confluent API to direct BMC configuration',
-                   action='store_true')
-    args = a.parse_args()
-    if args.i:
-        bmccfg = json.load(open(args.i))
-    elif args.c:
-        bmccfgsrc = subprocess.check_output(
-            [sys.executable, apiclient, '/confluent-api/self/bmcconfig', '-j'])
-        bmccfg = json.loads(bmccfgsrc)
-    else:
-        bmccfg = {}
-    if args.p is not None:
-        bmccfg['bmcport'] = args.p
-    if args.v is not None:
-        bmccfg['bmcvlan'] = args.v
-    vendor = open('/sys/devices/virtual/dmi/id/sys_vendor').read()
-    vendor = vendor.strip()
-    try:
-        model = open('/sys/devices/virtual/dmi/id/product_sku').read().strip()
-        if model == 'none':
-            raise Exception('No SKU')
-    except Exception:
-        model = open('/sys/devices/virtual/dmi/id/product_name').read()
-    if vendor in ('Lenovo', 'IBM'):
-        if '[' in model and ']' in model:
-            model = model.split('[')[1].split(']')[0]
-        model = model[:4].lower()
-    s = Session('/dev/ipmi0')
-    if not bmccfg:
-        print("No BMC configuration specified, exiting.")
-        return
-    if bmccfg.get('bmcport', None):
-        channel = set_port(s, bmccfg['bmcport'], vendor, model)
-    else:
-        channel = get_lan_channel(s)
-    awaitvlan = False
-    awaitip = False
-    awaitprefix = False
-    awaitgw = False
-    if bmccfg.get('bmcvlan', None):
-        awaitvlan = set_vlan(s, bmccfg['bmcvlan'], channel)
-    if bmccfg.get('bmcipv4', None):
-        awaitip = set_ipv4(s, bmccfg['bmcipv4'], channel)
-    if bmccfg.get('prefixv4', None):
-        awaitprefix = set_subnet(s, bmccfg['prefixv4'], channel)
-    if bmccfg.get('bmcgw', None):
-        awaitgw = set_gateway(s, bmccfg['bmcgw'], channel)
-    sys.stdout.write('Waiting for changes to take effect...')
-    sys.stdout.flush()
-    while awaitvlan and not check_vlan(s, bmccfg['bmcvlan'], channel):
-        dotwait()
-    while awaitip and not check_ipv4(s, bmccfg['bmcipv4'], channel):
-        dotwait()
-    while awaitprefix and not check_subnet(s, bmccfg['prefixv4'], channel):
-        dotwait()
-    while awaitprefix and not check_gateway(s, bmccfg['bmcgw'], channel):
-        dotwait()
-    sys.stdout.write('done\n')
-    sys.stdout.flush()
-    #await_config(s, bmccfg, channel)
-
-
-if __name__ == '__main__':
-    main()
@@ -1,4 +0,0 @@
-. /etc/confluent/functions
-# This is a convenient place to keep customizations separate from modifying the stock scripts
-# While modification of the stock scripts is fine, it may be easier to rebase to a newer
-# stock profile if the '.custom' files are used.
@@ -1,11 +0,0 @@
-[Unit]
-Description=First Boot Process
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-ExecStart=/opt/confluent/bin/firstboot.sh
-
-[Install]
-WantedBy=multi-user.target
-
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# This script is executed on the first boot after install has
-# completed. It is best to edit the middle of the file as
-# noted below so custom commands are executed before
-# the script notifies confluent that install is fully complete.
-
-nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
-apikey=$(cat /etc/confluent/confluent.apikey)
-mgr=$(grep deploy_server /etc/confluent/confluent.deploycfg|awk '{print $2}')
-profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-cat /etc/confluent/tls/*.pem >> /etc/pki/tls/certs/ca-bundle.crt
-export nodename mgr profile
-. /etc/confluent/functions
-
-
-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
-
-
-# Induce execution of remote configuration, e.g. ansible plays in ansible/firstboot.d/
-run_remote_config firstboot
-
-curl -X POST -d 'status: complete' -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $apikey" https://$mgr/confluent-api/self/updatestatus
-systemctl disable firstboot
-rm /etc/systemd/system/firstboot.service
@@ -1,93 +0,0 @@
-function set_confluent_vars() {
-    if [ -z "$mgr" ]; then
-        mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg | sed -e 's/[^ ]*: //')
-    fi
-    if [ -z "$profile" ]; then
-        profile=$(grep ^profile: /etc/confluent/confluent.deploycfg | sed -e 's/[^ ]*: //')
-    fi
-}
-
-fetch_remote() {
-    if [ -f /etc/confluent/ca.pem ]; then
-        curlargs=" --cacert /etc/confluent/ca.pem"
-    fi
-    set_confluent_vars
-    mkdir -p $(dirname $1)
-    curl -f -sS $curlargs https://$mgr/confluent-public/os/$profile/scripts/$1 > $1
-    if [ $? != 0 ]; then echo $1 failed to download; return 1; fi
-}
-
-run_remote_parts() {
-    scriptlist=$(/usr/libexec/platform-python /etc/confluent/apiclient /confluent-api/self/scriptlist/$1|sed -e 's/^- //')
-    for script in $scriptlist; do
-        run_remote $1.d/$script
-    done
-}
-
-run_remote() {
-    requestedcmd="'$*'"
-    curlargs=""
-    if [ -f /etc/confluent/ca.pem ]; then
-        curlargs=" --cacert /etc/confluent/ca.pem"
-    fi
-    set_confluent_vars
-    echo
-    echo '---------------------------------------------------------------------------'
-    echo Running $requestedcmd from https://$mgr/confluent-public/os/$profile/scripts/
-    tmpdir=$(mktemp -d)
-    echo Executing in $tmpdir
-    cd $tmpdir
-    mkdir -p $(dirname $1)
-    curl -f -sS $curlargs https://$mgr/confluent-public/os/$profile/scripts/$1 > $1
-    if [ $? != 0 ]; then echo $requestedcmd failed to download; return 1; fi
-    chmod +x $1
-    cmd=$1
-    if [ -x /usr/bin/chcon ]; then
-        chcon system_u:object_r:bin_t:s0 $cmd
-    fi
-    shift
-    ./$cmd $*
-    retcode=$?
-    echo "$requestedcmd exited with code $retcode"
-    cd - > /dev/null
-    return $retcode
-}
-
-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://$mgr/confluent-public/os/$profile/scripts/
-    tmpdir=$(mktemp -d)
-    echo Executing in $tmpdir
-    cd $tmpdir
-    mkdir -p $(dirname $1)
-    curl -f -sS $curlargs https://$mgr/confluent-public/os/$profile/scripts/$1 > $1
-    if [ $? != 0 ]; then echo "'$*'" failed to download; return 1; fi
-    /usr/libexec/platform-python $*
-    retcode=$?
-    echo "'$*' exited with code $retcode"
-    cd - > /dev/null
-    return $retcode
-}
-
-run_remote_config() {
-    echo
-    set_confluent_vars
-    apiclient=/opt/confluent/bin/apiclient
-    if [ -f /etc/confluent/apiclient ]; then
-        apiclient=/etc/confluent/apiclient
-    fi
-    echo '---------------------------------------------------------------------------'
-    echo Requesting to run remote configuration for "'$*'" from $mgr under profile $profile
-    /usr/libexec/platform-python $apiclient /confluent-api/self/remoteconfig/"$*" -d {}
-    /usr/libexec/platform-python $apiclient /confluent-api/self/remoteconfig/status -w 204
-    echo
-    echo 'Completed remote configuration'
-    echo '---------------------------------------------------------------------------'
-    return
-}
-
@@ -1,88 +0,0 @@
-import subprocess
-import os
-
-class DiskInfo(object):
-    def __init__(self, devname):
-        self.name = devname
-        self.wwn = None
-        self.path = None
-        self.model = ''
-        self.size = 0
-        self.driver = None
-        self.mdcontainer = ''
-        devnode = '/dev/{0}'.format(devname)
-        qprop = subprocess.check_output(
-            ['udevadm', 'info', '--query=property', devnode])
-        if not isinstance(qprop, str):
-            qprop = qprop.decode('utf8')
-        for prop in qprop.split('\n'):
-            if '=' not in prop:
-                continue
-            k, v = prop.split('=', 1)
-            if k == 'DEVTYPE' and v != 'disk':
-                raise Exception('Not a disk')
-            elif k == 'DM_NAME':
-                raise Exception('Device Mapper')
-            elif k == 'ID_MODEL':
-                self.model = v
-            elif k == 'DEVPATH':
-                self.path = v
-            elif k == 'ID_WWN':
-                self.wwn = v
-            elif k == 'MD_CONTAINER':
-                self.mdcontainer = v
-        attrs = subprocess.check_output(['udevadm', 'info', '-a', devnode])
-        if not isinstance(attrs, str):
-            attrs = attrs.decode('utf8')
-        for attr in attrs.split('\n'):
-            if '==' not in attr:
-                continue
-            k, v = attr.split('==', 1)
-            k = k.strip()
-            if k == 'ATTRS{size}':
-                self.size = v.replace('"', '')
-            elif (k == 'DRIVERS' and not self.driver
-                    and v not in ('"sd"', '""')):
-                self.driver = v.replace('"', '')
-        if not self.driver and 'imsm' not in self.mdcontainer:
-            raise Exception("No driver detected")
-
-    @property
-    def priority(self):
-        if self.model.lower() in ('thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
-            return 0
-        if 'imsm' in self.mdcontainer:
-            return 1
-        if self.driver == 'ahci':
-            return 2
-        if self.driver.startswith('megaraid'):
-            return 3
-        if self.driver.startswith('mpt'):
-            return 4
-        return 99
-
-    def __repr__(self):
-        return repr({
-            'name': self.name,
-            'path': self.path,
-            'wwn': self.wwn,
-            'driver': self.driver,
-            'size': self.size,
-            'model': self.model,
-        })
-
-
-def main():
-    disks = []
-    for disk in sorted(os.listdir('/sys/class/block')):
-        try:
-            disk = DiskInfo(disk)
-            disks.append(disk)
-        except Exception as e:
-            print("Skipping {0}: {1}".format(disk, str(e)))
-    nd = [x.name for x in sorted(disks, key=lambda x: x.priority)]
-    if nd:
-        open('/tmp/installdisk', 'w').write(nd[0])
-
-if __name__ == '__main__':
-    main()
@@ -1,20 +0,0 @@
-# To use this script, rename or copy the mofed image to either ofed.tgz or ofed.iso
-# and modify the script below if wanting to use the iso instead of tgz
-
-# It checks for mellanox devices and opts not to install, so this script could be added
-# to a general profile without causing mofed to install on non-mellanox systems
-. /etc/confluent/functions
-if lspci -d 15b3:: -n |grep 15b3 > /dev/null; then
-    # Uncomment the following three lines and comment out the next
-    # two lines to use the .iso instead of the tgz packaging
-    #fetch_remote infiniband/mofed.iso
-    #mkdir MLNX_OFED
-    #mount -o loop ofed.iso MLNX_OFED
-    fetch_remote infiniband/mofed.tgz
-    tar xf infiniband/mofed.tgz
-    # The rest is common between tar and iso
-    cd MLNX_OFED*
-    mount -o loop ofed
-    ./mlnxofedinstall --force
-fi
-
@@ -1,10 +0,0 @@
-# Add needed base packages to the install
-cat << EOF >> /tmp/addonpackages
-perl
-pkgconf-pkg-config
-tcsh
-lsof
-tk
-gcc-gfortran
-tcl
-EOF
@@ -1,7 +0,0 @@
-. /etc/confluent/functions
-# This is a convenient place to keep customizations separate from modifying the stock scripts
-# While modification of the stock scripts is fine, it may be easier to rebase to a newer
-# stock profile if the '.custom' files are used.
-
-# An example for installing OFED for infiniband follows (see the file for more detail):
-#run_remote infiniband/mofed.post
@@ -1,44 +0,0 @@
-#!/bin/sh
-# need to copy over ssh key info
-nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
-apikey=$(cat /etc/confluent/confluent.apikey)
-
-chmod 700 /etc/confluent
-chmod og-rwx /etc/confluent/*
-export mgr profile nodename
-. /etc/confluent/functions
-
-
-if [ -f /tmp/cryptboot ]; then
-    run_remote tpm_luks.sh
-fi
-
-# By default, the install repository is ignored, change
-# this by manually adding local repositories
-
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-*
-run_remote_python add_local_repositories
-# This script will execute in the installed system, but using the installer kernel prior to reboot.
-# This is an appropriate place to run post install activities that do not require the actual installed
-# kernel to run. For example adding drivers that would be needed for first boot to run cleanly.
-# If, for example, there is a post script that has a dependency on a driver or filesystem that
-# cannot work until booting into the installer, use firstboot.sh instead
-
-# run_remote will download and execute from /var/lib/confluent/public/os/<profile>/scripts/ directory
-# run_remote_python will use the appropriate python interpreter path to run the specified script
-# A post.custom is provided to more conveniently hold customizations, see the post.custom file.
-
-# This will induce server side processing of the syncfile contents if
-# present
-run_remote_python syncfileclient
-
-# run_remote example.sh
-# run_remote_python example.py
-run_remote post.custom
-
-# Also, scripts may be placed into 'post.d', e.g. post.d/01-runfirst.sh, post.d/02-runsecond.sh
-run_remote_parts post
-
-# Induce execution of remote configuration, e.g. ansible plays in ansible/post.d/
-run_remote_config post
-curl -X POST -d 'status: staged' -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $apikey" https://$mgr/confluent-api/self/updatestatus
@@ -1,13 +0,0 @@
-. /tmp/functions
-# This is a convenient place to keep customizations separate from modifying the stock scripts
-# While modification of the stock scripts is fine, it may be easier to rebase to a newer
-# stock profile if the '.custom' files are used.
-#
-#Here is an example to locally configure the platform BMC according
-#to confluent configuration so that the BMC would be on the correct
-#network:
-#run_remote_python configbmc -c
-
-#Some addons improve efficiency by adding dependencies during install
-#here is an example for adding OFED install prereqs to the install
-#run_remote infiniband/mofed.pre
@@ -1,82 +0,0 @@
-#!/bin/sh
-
-# This runs prior to the installer beginning. This is used to rewrite the 
-# scripted install file, merging data from confluent and identifying
-# the most appropriate install source.
-
-# If you want to use a more custom partition plan, the easiest
-# method is to edit the kicktstart file and comment out or
-# delete %include /tmp/partitioning
-
-/usr/libexec/platform-python /etc/confluent/apiclient >& /dev/null
-nicname=$(ip link|grep ^$(cat /tmp/confluent.ifidx): | awk '{print $2}' | awk -F: '{print $1}')
-nmcli c u $nicname
-while ip -6 addr | grep tentative > /dev/null; do
-   sleep 0.5
-done
-nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
-locale=$(grep ^locale: /etc/confluent/confluent.deploycfg)
-locale=${locale#locale: }
-keymap=$(grep ^keymap: /etc/confluent/confluent.deploycfg)
-keymap=${keymap#keymap: }
-echo lang $locale > /tmp/langinfo
-echo keyboard --vckeymap=$keymap >> /tmp/langinfo
-tz=$(grep ^timezone: /etc/confluent/confluent.deploycfg)
-tz=${tz#timezone: }
-ntpsrvs=""
-if grep ^ntpservers: /etc/confluent/confluent.deploycfg > /dev/null; then
-    ntpsrvs="--ntpservers="$(sed -n '/^ntpservers:/,/^[^-]/p' /etc/confluent/confluent.deploycfg|sed 1d|sed '$d' | sed -e 's/^- //' | paste -sd,)
-fi
-echo timezone $ntpsrvs $tz --utc > /tmp/timezone
-rootpw=$(grep ^rootpassword /etc/confluent/confluent.deploycfg | awk '{print $2}')
-if [ "$rootpw" = null ]; then
-    echo "rootpw --lock" > /tmp/rootpw
-else
-    echo "rootpw --iscrypted $rootpw" > /tmp/rootpw
-fi
-curl -f https://$mgr/confluent-public/os/$profile/profile.yaml > /tmp/instprofile.yaml
-blargs=$(grep ^installedargs: /tmp/instprofile.yaml | sed -e 's/#.*//' -e 's/^installedargs: //')
-if [ ! -z "$blargs" ]; then
-	blargs=' --append="'$blargs'"'
-fi
-grubpw=$(grep ^grubpassword /etc/confluent/confluent.deploycfg | awk '{print $2}')
-if [ "$grubpw" = "null" ]; then
-    touch /tmp/grubpw
-else
-    blargs=" --iscrypted --password=$grubpw $blargs"
-fi
-if [ ! -z "$blargs" ]; then
-    echo "bootloader $blargs" > /tmp/grubpw
-fi
-for pubkey in /etc/ssh/ssh_host*key.pub; do
-    certfile=${pubkey/.pub/-cert.pub}
-    curl -f -X POST -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" -d @$pubkey https://$mgr/confluent-api/self/sshcert > $certfile
-    echo HostCertificate $certfile >> /etc/ssh/sshd_config.anaconda
-done
-/usr/sbin/sshd -f /etc/ssh/sshd_config.anaconda
-if [ -f "/run/install/cmdline.d/01-autocons.conf" ]; then
-    consoledev=$(cat /run/install/cmdline.d/01-autocons.conf | sed -e 's!console=!/dev/!' -e 's/,.*//')
-    tmux a <> $consoledev >&0 2>&1 &
-fi
-cryptboot=$(grep ^encryptboot: /etc/confluent/confluent.deploycfg | awk '{print $2}')
-LUKSPARTY=''
-touch /tmp/cryptpkglist
-touch /tmp/addonpackages
-if [ "$cryptboot" == "tpm2" ]; then
-	LUKSPARTY="--encrypted --passphrase=$(cat /etc/confluent/confluent.apikey)"
-	echo $cryptboot >> /tmp/cryptboot
-	echo clevis-dracut >> /tmp/cryptpkglist
-fi
-
-
-export mgr profile nodename
-curl -f https://$mgr/confluent-public/os/$profile/scripts/functions > /tmp/functions
-. /tmp/functions
-run_remote_python getinstalldisk
-if [ -e /tmp/installdisk ]; then
-    echo clearpart --all --initlabel >> /tmp/partitioning
-    echo ignoredisk --only-use $(cat /tmp/installdisk) >> /tmp/partitioning
-    echo autopart --nohome $LUKSPARTY >> /tmp/partitioning
-fi
-curl -f https://$mgr/confluent-public/os/$profile/kickstart.custom > /tmp/kickstart.custom
-run_remote pre.custom
--- a/Show More
+++ b/Show More