Have SSDP ignore multicast disabled interfaces

LICENSE

@@ -175,3 +175,28 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.

confluent_client/COPYRIGHT

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

confluent_client/bin/confetty

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

confluent_client/bin/confluent2xcat

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

confluent_client/bin/dir2img

@@ -21,17 +21,17 @@ def create_image(directory, image, label=None):
             currsz = (currsz // 512 +1) * 512
             datasz += currsz
     datasz += ents * 32768
-    datasz = datasz // 4096 + 1
+    datasz = datasz // 512 + 1
     with open(image, 'wb') as imgfile:
-        imgfile.seek(datasz * 4096 - 1)
+        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', '4','-h', '2', '::'])
+                               '-s', '1','-h', '1', '::'])
     else:
         subprocess.check_call(['mformat', '-i', image, '-r', '16', '-d', '1', '-t',
-                                str(datasz), '-s', '4','-h', '2', '::'])
+                                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
@@ -58,4 +58,4 @@ if __name__ == '__main__':
     label = None
     if len(sys.argv) > 3:
         label = sys.argv[3]
-    create_image(sys.argv[1], sys.argv[2], label)
+    create_image(sys.argv[1], sys.argv[2], label)

confluent_client/bin/nodeconfig

@@ -289,11 +289,13 @@ else:
     for path in queryparms:
         if options.comparedefault:
             continue
-        rcode |= client.print_attrib_path(path, session, list(queryparms[path]),
+        rc = client.print_attrib_path(path, session, list(queryparms[path]),
                                       NullOpt(), queryparms[path])
+        if rc:
+            sys.exit(rc)
     if printsys == 'all' or printextbmc or printbmc or printallbmc:
         if printbmc or not printextbmc:
-         rcode |= client.print_attrib_path(
+         rcode = client.print_attrib_path(
                         '/noderange/{0}/configuration/management_controller/extended/all'.format(noderange),
                         session, printbmc, options, attrprefix='bmc.')
         if options.extra:

confluent_client/bin/nodeconsole

@@ -25,7 +25,6 @@ if path.startswith('/opt'):
     sys.path.append(path)
 import confluent.client as client
 import confluent.sortutil as sortutil
-import confluent.logreader as logreader
 
 confettypath = os.path.join(os.path.dirname(sys.argv[0]), 'confetty')
 argparser = optparse.OptionParser(
@@ -36,62 +35,10 @@ argparser = optparse.OptionParser(
            "console")
 argparser.add_option('-t', '--tile', action='store_true', default=False,
                      help='Tile console windows in the terminal')
-argparser.add_option('-l', '--log', action='store_true', default=False,
-                     help='Enter log replay mode instead of showing a live console')
-argparser.add_option('-w','--windowed', action='store_true', default=False,
-                     help='Open terminal windows for each node.  The '
-                          'environment variable NODECONSOLE_WINDOWED_COMMAND '
-                          'should be set, which should be a text string corresponding '
-                          'to a command that can be used to open a windowed console,'
-                          ' omitting the "nodeconsole <noderange>" part of the '
-                          'command, for example, to open a set of consoles for a '
-                          'range of nodes in separate xterm windows, set '
-                          'NODECONSOLE_WINDOWED_COMMAND to "xterm -e".  To open a '
-                          'set of consoles for a range of nodes in separate '
-                          'GNOME Terminal windows with a size of 100 columns and '
-                          '31 rows, set NODECONSOLE_WINDOWED_COMMAND '
-                          'to "gnome-terminal --geometry 100x31 --" or in a WSL '
-                          'environment, to open a set of consoles for a range of '
-                          'nodes in separate Windows Terminal windows, with the '
-                          'title set for each node, set NODECONSOLE_WINDOWED_COMMAND'
-                          ' to "wt.exe wsl.exe -d AlmaLinux-8 '
-                          '--shell-type login".  If the NODECONSOLE_WINDOWED_COMMAND '
-                          'environment variable isn\'t set, xterm will be used by'
-                          'default.')
 (options, args) = argparser.parse_args()
 if len(args) != 1:
     argparser.print_help()
     sys.exit(1)
-if options.log:
-    logname = args[0]
-    if not os.path.exists(logname) and logname[0] != '/':
-        logname = os.path.join('/var/log/confluent/consoles', logname)
-    if not os.path.exists(logname):
-        sys.stderr.write('Unable to locate {0} on local system\n'.format(logname))
-        sys.exit(1)
-    logreader.replay_to_console(logname)
-    sys.exit(0)
-#added functionality for wcons
-
-if options.windowed:
-    envstring=os.environ.get('NODECONSOLE_WINDOWED_COMMAND')
-    if not envstring:
-        envlist=["xterm", "-e"]
-    else:
-        envlist=os.environ.get('NODECONSOLE_WINDOWED_COMMAND').split(' ')
-    nodes = []
-    sess = client.Command()
-    for res in sess.read('/noderange/{0}/nodes/'.format(args[0])):
-        node = res.get('item', {}).get('href', '/').replace('/', '')
-        if not node:
-            sys.stderr.write(res.get('error', repr(res)) + '\n')
-            sys.exit(1)
-        nodes.append(node)
-    for node in sortutil.natural_sort(nodes):
-        with open(os.devnull, 'wb') as devnull:
-            subprocess.Popen(envlist + [confettypath, '-m', '5', 'start', '/nodes/{0}/console/session'.format(node)], stdin=devnull)
-    sys.exit(0)
-#end of wcons
 if options.tile:
     null = open('/dev/null', 'w')
     nodes = []

confluent_client/bin/nodedeploy

@@ -85,22 +85,6 @@ def main(args):
         sys.stderr.write('Unrecognized arguments: ' + repr(extra) + '\n')
     c = client.Command()
     c.stop_if_noderange_over(args.noderange, args.maxnodes)
-    errnodes = set([])
-    for rsp in c.read('/noderange/{0}/nodes/'.format(args.noderange)):
-        if 'error' in rsp:
-            sys.stderr.write(rsp['error'] + '\n')
-            sys.exit(1)
-    if not args.clear and args.network and not args.prepareonly:
-        rc = c.simple_noderange_command(args.noderange, '/boot/nextdevice', 'network',
-                                        bootmode='uefi',
-                                        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')
     if args.clear:
         cleararm(args.noderange, c)
         clearpending(args.noderange, c)
@@ -155,7 +139,18 @@ def main(args):
                 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
 

confluent_client/bin/nodediscover

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

confluent_client/bin/nodegroupattrib

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

confluent_client/bin/nodeping

@@ -1,140 +0,0 @@
-#!/usr/bin/python2
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2016-2017 Lenovo
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from collections import deque
-import optparse
-import os
-import select
-import signal
-import subprocess
-import sys
-
-try:
-    signal.signal(signal.SIGPIPE, signal.SIG_DFL)
-except AttributeError:
-    pass
-path = os.path.dirname(os.path.realpath(__file__))
-path = os.path.realpath(os.path.join(path, '..', 'lib', 'python'))
-if path.startswith('/opt'):
-    sys.path.append(path)
-
-import confluent.client as client
-import confluent.sortutil as sortutil
-
-
-def run():
-
-    argparser = optparse.OptionParser(
-        usage="Usage: %prog [options] noderange")
-    argparser.add_option('-f', '-c', '--count', type='int', default=168,
-                         help='Number of commands to run at a time')
-    argparser.add_option('-s', '--substitutename',
-                         help='Use a different name other than the nodename for ping, with {}, it is the entire name evaluated as an expression, otherwise it is used as a suffix')
-    # among other things, FD_SETSIZE limits.  Besides, spawning too many
-    # processes can be unkind for the unaware on memory pressure and such...
-    (options, args) = argparser.parse_args()
-    if len(args) < 1:
-        argparser.print_help()
-        sys.exit(1)
-    client.check_globbing(args[0])
-    concurrentprocs = options.count
-    c = client.Command()
-
-    currprocs = 0
-    all = set([])
-    pipedesc = {}
-    pendingexecs = deque()
-    exitcode = 0
-
-    nodemap = {}
-    if options.substitutename:
-        subname = options.substitutename
-        if '{' not in subname:
-            subname = '{node}' + subname
-        for exp in c.create('/noderange/{0}/attributes/expression'.format(args[0]),
-                        {'expression': subname}):
-            if 'error' in exp:
-                sys.stderr.write(exp['error'] + '\n')
-                exitcode |= exp.get('errorcode', 1)
-            ex = exp.get('databynode', ())
-            for node in ex:
-                nodemap[node] = ex[node]['value']
-    for rsp in c.read('/noderange/{0}/nodes/'.format(args[0])):
-        if 'error' in rsp:
-            sys.stderr.write(rsp['error'] + '\n')
-            exitcode |= rsp.get('errorcode', 1)
-        if rsp.get('item', {}).get('href', None):
-            node = rsp['item']['href'][:-1]
-            pingnode = nodemap.get(node, node)
-            cmdv = ['ping', '-c', '1', '-W', '1', pingnode]
-            if currprocs < concurrentprocs:
-                currprocs += 1
-                run_cmdv(pingnode, cmdv, all, pipedesc)
-            else:
-                pendingexecs.append((pingnode, cmdv))
-    if not all or exitcode:
-        sys.exit(exitcode)
-    rdy, _, _ = select.select(all, [], [], 10)
-    while all:
-        pernodeout = {}
-        for r in rdy:
-            desc = pipedesc[r]
-            node = desc['node']
-            data = True
-            while data and select.select([r], [], [], 0)[0]:
-                data = r.readline()
-                if not data:
-                    pop = desc['popen']
-                    ret = pop.poll()
-                    if ret is not None:
-                        exitcode = exitcode | ret
-                        all.discard(r)
-                        r.close()
-                        if desc['type'] == 'stdout':
-                            if ret:
-                                print('{0}: no_ping'.format(node))
-                            else:
-                                print('{0}: ping'.format(node))
-                            if pendingexecs:
-                                node, cmdv = pendingexecs.popleft()
-                                run_cmdv(node, cmdv, all, pipedesc)
-        for node in sortutil.natural_sort(pernodeout):
-            for line in pernodeout[node]:
-                line = client.stringify(line)
-                if options.nonodeprefix:
-                    sys.stdout.write(line)
-                else:
-                    sys.stdout.write('{0}: {1}'.format(node, line))
-        sys.stdout.flush()
-        if all:
-            rdy, _, _ = select.select(all, [], [], 10)
-    sys.exit(exitcode)
-
-
-def run_cmdv(node, cmdv, all, pipedesc):
-    nopen = subprocess.Popen(
-        cmdv, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    pipedesc[nopen.stdout] = {'node': node, 'popen': nopen,
-                              'type': 'stdout'}
-    pipedesc[nopen.stderr] = {'node': node, 'popen': nopen,
-                              'type': 'stderr'}
-    all.add(nopen.stdout)
-    all.add(nopen.stderr)
-
-
-if __name__ == '__main__':
-    run()

confluent_client/bin/nodepower

@@ -33,7 +33,7 @@ import confluent.client as client
 
 argparser = optparse.OptionParser(
     usage="Usage: %prog [options] <noderange> "
-          "([status|on|off|shutdown|boot|reset|pdu_status|pdu_off|pdu_on])")
+          "([status|on|off|shutdown|boot|reset])")
 argparser.add_option('-p', '--showprevious', dest='previous',
                      action='store_true', default=False,
                      help='Show previous power state')
@@ -51,27 +51,22 @@ except IndexError:
 client.check_globbing(noderange)
 setstate = None
 if len(args) > 1:
-    setstate = args[1]
     if setstate == 'softoff':
         setstate = 'shutdown'
+    elif not args[1] in ('stat', 'state', 'status'):
+        setstate = args[1]
 
-if setstate not in (None, 'on', 'off', 'shutdown', 'boot', 'reset', 'pdu_status', 'pdu_stat', 'pdu_on', 'pdu_off', 'status', 'stat', 'state'):
+if setstate not in (None, 'on', 'off', 'shutdown', 'boot', 'reset'):
     argparser.print_help()
     sys.exit(1)
 session = client.Command()
 exitcode = 0
 session.add_precede_key('oldstate')
-powurl = 'state'
-if setstate and setstate.startswith('pdu_'):
-    setstate = setstate.replace('pdu_', '')
-    powurl = 'inlets/all'
-if setstate in ('status', 'state', 'stat'):
-    setstate = None
 
 if options.previous:
     # get previous states
     prev = {}
-    for rsp in session.read("/noderange/{0}/power/{1}".format(noderange, powurl)):
+    for rsp in session.read("/noderange/{0}/power/state".format(noderange)):
         # gets previous (current) states
 
         databynode = rsp["databynode"]
@@ -82,7 +77,4 @@ if options.previous:
     # add dictionary to session
     session.add_precede_dict(prev)
 
-def outhandler(node, res):
-    for k in res[node]:
-        client.cprint('{0}: {1}: {2}'.format(node, k.replace('inlet_', ''), res[node][k]))
-sys.exit(session.simple_noderange_command(noderange, '/power/{0}'.format(powurl), setstate, promptover=options.maxnodes, key='state', outhandler=outhandler))
+sys.exit(session.simple_noderange_command(noderange, '/power/state', setstate, promptover=options.maxnodes))

confluent_client/bin/nodersync

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

confluent_client/bin/noderun

@@ -35,12 +35,9 @@ if path.startswith('/opt'):
 
 import confluent.client as client
 import confluent.sortutil as sortutil
-devnull = None
 
 
 def run():
-    global devnull
-    devnull = open(os.devnull, 'rb')
     argparser = optparse.OptionParser(
         usage="Usage: %prog [options] <noderange> <command expression>",
         epilog="Expressions are the same as in attributes, e.g. "
@@ -136,7 +133,7 @@ def run():
 def run_cmdv(node, cmdv, all, pipedesc):
     try:
         nopen = subprocess.Popen(
-            cmdv, stdin=devnull, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            cmdv, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     except OSError as e:
         if e.errno == 2:
             sys.stderr.write('{0}: Unable to find local executable file "{1}"'.format(node, cmdv[0]))

confluent_client/bin/nodeshell

@@ -34,11 +34,10 @@ if path.startswith('/opt'):
 
 import confluent.client as client
 import confluent.sortutil as sortutil
-devnull = None
+
 
 def run():
-    global devnull
-    devnull = open(os.devnull, 'rb')
+
     argparser = optparse.OptionParser(
         usage="Usage: %prog [options] noderange commandexpression",
         epilog="Expressions are the same as in attributes, e.g. "
@@ -53,8 +52,6 @@ def run():
                          help='Specify a custom port for ssh')
     argparser.add_option('-s', '--substitutename',
                          help='Use a different name other than the nodename for ssh')
-    argparser.add_option('-x', '--noexpression', action='store_true',
-                         help='Suppress expression expansion of command')
     argparser.add_option('-m', '--maxnodes', type='int',
                      help='Specify a maximum number of '
                           'nodes to run remote ssh command to, '
@@ -91,39 +88,28 @@ def run():
             ex = exp.get('databynode', ())
             for node in ex:
                 nodemap[node] = ex[node]['value']
-    cmdparms = []
-    if options.noexpression:
-        for res in c.read('/noderange/{0}/nodes/'.format(args[0])):
-            if 'error' in res:
-                sys.stderr.write(res['error'] + '\n')
-                exitcode |= res.get('errorcode', 1)
-                break
-            node = res['item']['href'][:-1]
-            cmdparms.append((node, cmdstr))
-    else:
-        for exp in c.create('/noderange/{0}/attributes/expression'.format(args[0]),
-                            {'expression': cmdstr}):
-            if 'error' in exp:
-                sys.stderr.write(exp['error'] + '\n')
-                exitcode |= exp.get('errorcode', 1)
-            ex = exp.get('databynode', ())
-            for node in ex:
-                cmdparms.append((node, ex[node]['value']))
-    for node, cmd in cmdparms:
-        sshnode = nodemap.get(node, node)
-        if not isinstance(cmd, str) and not isinstance(cmd, bytes):
-            cmd = cmd.encode('utf-8')
-        cmdv = ['ssh']
-        if options.port:
-            cmdv += ['-p', '{0}'.format(options.port)]
-        if options.loginname:
-            cmdv += ['-l', options.loginname]
-        cmdv += [sshnode, cmd]
-        if currprocs < concurrentprocs:
-            currprocs += 1
-            run_cmdv(node, cmdv, all, pipedesc)
-        else:
-            pendingexecs.append((node, cmdv))
+    for exp in c.create('/noderange/{0}/attributes/expression'.format(args[0]),
+                        {'expression': cmdstr}):
+        if 'error' in exp:
+            sys.stderr.write(exp['error'] + '\n')
+            exitcode |= exp.get('errorcode', 1)
+        ex = exp.get('databynode', ())
+        for node in ex:
+            cmd = ex[node]['value']
+            sshnode = nodemap.get(node, node)
+            if not isinstance(cmd, str) and not isinstance(cmd, bytes):
+                cmd = cmd.encode('utf-8')
+            cmdv = ['ssh']
+            if options.port:
+                cmdv += ['-p', '{0}'.format(options.port)]
+            if options.loginname:
+                cmdv += ['-l', options.loginname]
+            cmdv += [sshnode, cmd]
+            if currprocs < concurrentprocs:
+                currprocs += 1
+                run_cmdv(node, cmdv, all, pipedesc)
+            else:
+                pendingexecs.append((node, cmdv))
     if not all or exitcode:
         sys.exit(exitcode)
     rdy, _, _ = select.select(all, [], [], 10)
@@ -163,7 +149,6 @@ def run():
                 if options.nonodeprefix:
                     sys.stdout.write(line)
                 else:
-                    line = line.lstrip('\x08')
                     sys.stdout.write('{0}: {1}'.format(node, line))
         sys.stdout.flush()
         if all:
@@ -173,7 +158,7 @@ def run():
 
 def run_cmdv(node, cmdv, all, pipedesc):
     nopen = subprocess.Popen(
-        cmdv, stdin=devnull, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        cmdv, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     pipedesc[nopen.stdout] = {'node': node, 'popen': nopen,
                               'type': 'stdout'}
     pipedesc[nopen.stderr] = {'node': node, 'popen': nopen,

confluent_client/confluent/client.py

@@ -208,7 +208,7 @@ class Command(object):
     def add_precede_dict(self, dict):
         self._prevdict = dict
 
-    def handle_results(self, ikey, rc, res, errnodes=None, outhandler=None):
+    def handle_results(self, ikey, rc, res, errnodes=None):
         if 'error' in res:
             if errnodes is not None:
                 errnodes.add(self._currnoderange)
@@ -245,12 +245,10 @@ class Command(object):
                         node, val, self._prevdict[node]))
                 else:
                     cprint('{0}: {1}'.format(node, val))
-            elif outhandler:
-                outhandler(node, res)
         return rc
 
     def simple_noderange_command(self, noderange, resource, input=None,
-                                 key=None, errnodes=None, promptover=None, outhandler=None, **kwargs):
+                                 key=None, errnodes=None, promptover=None, **kwargs):
         try:
             self._currnoderange = noderange
             rc = 0
@@ -264,13 +262,13 @@ class Command(object):
             if input is None:
                 for res in self.read('/noderange/{0}/{1}'.format(
                         noderange, resource)):
-                    rc = self.handle_results(ikey, rc, res, errnodes, outhandler)
+                    rc = self.handle_results(ikey, rc, res, errnodes)
             else:
                 self.stop_if_noderange_over(noderange, promptover)
                 kwargs[ikey] = input
                 for res in self.update('/noderange/{0}/{1}'.format(
                         noderange, resource), kwargs):
-                    rc = self.handle_results(ikey, rc, res, errnodes, outhandler)
+                    rc = self.handle_results(ikey, rc, res, errnodes)
             self._currnoderange = None
             return rc
         except KeyboardInterrupt:

confluent_client/confluent/termhandler.py

@@ -53,16 +53,13 @@ class TermHandler(object):
             connection = None
             try:
                 connection, address = self.socket.accept()
-                connection.sendall(b"confetty control v1--\n")
+                connection.sendall("confetty control v1--\n")
                 cmd = connection.recv(8)
-                if b'GETWINID' == cmd:
-                    winid = os.environ['WINDOWID']
-                    if not isinstance(winid, bytes):
-                        winid = winid.encode('utf8')
-                    connection.sendall(winid)
+                if 'GETWINID' == cmd:
+                    connection.sendall(os.environ['WINDOWID'])
                 connection.close()
             except BaseException:
                 pass
             finally:
                 if connection is not None:
-                    connection.close()
+                    connection.close()

confluent_client/confluent/tlvdata.py

@@ -19,12 +19,8 @@ import array
 import ctypes
 import ctypes.util
 import confluent.tlv as tlv
-try:
-    import eventlet.green.socket as socket
-    import eventlet.green.select as select
-except ImportError:
-    import socket
-    import select
+import eventlet.green.socket as socket
+import eventlet.green.select as select
 from datetime import datetime
 import json
 import os
@@ -244,12 +240,8 @@ def recv(handle):
         cdata = cmsgarr[CMSG_LEN(0).value:]
         data = rawbuffer[:i]
         if cmsg.cmsg_level == socket.SOL_SOCKET and cmsg.cmsg_type == SCM_RIGHTS:
-            try:
-                filehandles.fromstring(bytes(
-                    cdata[:len(cdata) - len(cdata) % filehandles.itemsize]))
-            except AttributeError:
-                filehandles.frombytes(bytes(
-                    cdata[:len(cdata) - len(cdata) % filehandles.itemsize]))
+            filehandles.fromstring(bytes(
+                cdata[:len(cdata) - len(cdata) % filehandles.itemsize]))
         data = json.loads(bytes(data))
         return ClientFile(data['filename'], data['mode'], filehandles[0])
     else:

confluent_client/confluent_client.spec.tmpl

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

confluent_client/confluent_env.sh

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

confluent_client/doc/man/nodeconsole.ronn

@@ -22,31 +22,6 @@ a new session.
   Use tmux to arrange consoles of the given noderange into a tiled layout on
   the terminal screen
 
-* `-l`, `--log`:
-  Perform a log reply on the current, local log in /var/log/confluent/consoles.
-  If in collective mode, this only makes sense to use on the current collective
-  manager at this time.
-  
-* `-w`, `--windowed`:
-  Open terminal windows for each node.  The
-  environment variable **NODECONSOLE_WINDOWED_COMMAND**
-  should be set, which should be a text string corresponding
-  to a command that can be used to open a windowed console,
-  omitting the `nodeconsole <noderange>` part of the
-  command, for example, to open a set of consoles for a
-  range of nodes in separate xterm windows, set
-  **NODECONSOLE_WINDOWED_COMMAND** to `xterm -e`.  To open a
-  set of consoles for a range of nodes in separate
-  GNOME Terminal windows with a size of 100 columns and
-  31 rows, set **NODECONSOLE_WINDOWED_COMMAND**
-  to `gnome-terminal --geometry 100x31 --` or in a WSL
-  environment, to open a set of consoles for a range of
-  nodes in separate Windows Terminal windows, with the
-  title set for each node, set **NODECONSOLE_WINDOWED_COMMAND**
-  to `wt.exe wsl.exe -d AlmaLinux-8 --shell-type login.  If the
-  NODECONSOLE_WINDOWED_COMMAND environment variable isn't set,
-  xterm will be used bydefault.
-
 ## ESCAPE SEQUENCE COMMANDS
 
 While connected to a console, a number of commands may be performed through escape

confluent_client/doc/man/nodediscover.ronn

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

confluent_client/doc/man/nodeping.ronn

@@ -1,47 +0,0 @@
-nodeping(8) -- Pings a node or a noderange.
-==============================
-## SYNOPSIS
-`nodeping [options] noderange`  
-
-## DESCRIPTION  
-**nodeping** is a command that pings the default NIC on a node.
-It can also be used with the `-s` flag to change the ping location to something that is 'non primary'
-
-
-## OPTIONS
-* ` -f` COUNT, `-c` COUNT, --count=COUNT  
-   Number of commands to run at a time  
-* `-h`, `--help`:  
-  Show help message and exit      
-* `-s` SUBSTITUTENAME, --substitutename=SUBSTITUTENAME  
-  Use a different name other than the nodename for ping. This may be a 
-  expression, such as {bmc} or, if no { character is present, it is treated as a suffix.  -s -eth1 would make n1 become n1-eth1, for example. 
-
-   
-## EXAMPLES
- * Pinging a node :  
-  `# nodeping <node>`  
-  `node : ping`    
-    
-* Pinging a group:  
-  `# nodeping <groupname>`    
-  `Node1 : ping  
-    Node2 : ping  
-    Node3 : ping`  
-
-* Pinging BMC on a node:  
-  `# nodeping -s {bmc} <noderange>`  
-  ` Node-bmc : ping`  
-
-* Pinging by specifying a suffix:
-  `# nodeping d1-d4 -s -eth1`  
-  `d2-eth1: no_ping`  
-  `d1-eth1: no_ping`  
-  `d3-eth1: no_ping`  
-  `d4-eth1: no_ping`  
-
-* Fail to ping node:  
-  `# nodeping <node>`  
-  `node : no_ping`  
- 
-

confluent_client/doc/man/nodepower.ronn

@@ -24,9 +24,6 @@ respond.
 * `reset`:  Request immediate reset of nodes of the noderange.  Nodes that are
 off will not react to this request.
 * `status`:  Behave identically to having no argument passed at all.
-* `pdu_status`: Query state of associated PDU outlets, if configured.
-* `pdu_on`: Energize all PDU outlets associated with the noderange.
-* `pdu_off`: De-energize all PDU outlets associated with the noderange.
 
 ## OPTIONS
 

confluent_client/doc/man/osdeploy.ronn

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

confluent_client/setup.py.tmpl

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

confluent_osdeploy/buildrpm

@@ -5,7 +5,6 @@ if [ "$NUMCOMMITS" != "$VERSION"  ]; then
 fi
 sed -e "s/#VERSION#/$VERSION/" confluent_osdeploy.spec.tmpl > confluent_osdeploy.spec
 cd ..
-cp ../LICENSE .
 tar Jcvf confluent_osdeploy.tar.xz confluent_osdeploy
 mv confluent_osdeploy.tar.xz ~/rpmbuild/SOURCES/
 cd -

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

@@ -132,11 +132,8 @@ def scan_confluents():
                     current['mgtiface'] = line.replace(b'MGTIFACE: ', b'').strip().decode('utf8')
             if len(peer) > 2:
                 current['myidx'] = peer[-1]
-            currip = peer[0]
-            if currip.startswith('fe80::') and '%' not in currip:
-                currip = '{0}%{1}'.format(currip, peer[-1])
-            srvs[currip] = current
-            srvlist.append(currip)
+            srvs[peer[0]] = current
+            srvlist.append(peer[0])
         r = select.select((s4, s6), (), (), 2)
         if r:
             r = r[0]
@@ -159,7 +156,6 @@ def get_net_apikey(nodename, mgr):
             else:
                 cliaddr = ('::', 302)
             clisock.bind(cliaddr)
-            clisock.settimeout(1)
             clisock.connect(addrinfo[-1])
             rsp = clisock.recv(8)
             if rsp != b'\xc2\xd1-\xa8\x80\xd8j\xba':
@@ -223,8 +219,7 @@ def get_apikey(nodename, hosts, errout=None):
     return apikey
 
 class HTTPSClient(client.HTTPConnection, object):
-    def __init__(self, usejson=False, port=443, host=None, errout=None, phmac=None):
-        self.phmac = phmac
+    def __init__(self, usejson=False, port=443, host=None, errout=None):
         self.errout = None
         if errout:
             self.errout = open(errout, 'w')
@@ -246,7 +241,6 @@ class HTTPSClient(client.HTTPConnection, object):
             info = open('/etc/confluent/confluent.info').read().split('\n')
             havedefault = '0'
             for line in info:
-                host = ''
                 if line.startswith('NODENAME:'):
                     node = line.split(' ')[1]
                     self.stdheaders['CONFLUENT_NODENAME'] = node
@@ -255,21 +249,15 @@ class HTTPSClient(client.HTTPConnection, object):
                 if line.startswith('EXTMGRINFO:'):
                     extinfo = line.split(' ')[1]
                     extinfo = extinfo.split('|')
-                    if havedefault == '0' and extinfo[2] == '1':
-                        host, mgtiface, havedefault = extinfo[:3]
-                        if '%' in host:
-                            ifidx = host.split('%', 1)[1]
-                            with open('/tmp/confluent.ifidx', 'w+') as ifout:
-                                ifout.write(ifidx)    
                     if not mgtiface:
                         host, mgtiface, havedefault = extinfo[:3]
-                    if host:
-                        if havedefault == '0':
-                            if '%' in host:
-                                ifidx = host.split('%', 1)[1]
-                                with open('/tmp/confluent.ifidx', 'w+') as ifout:
-                                    ifout.write(ifidx)
-                        self.hosts.append(host)
+                    if havedefault == '0' and extinfo[2] == '1':
+                        host, mgtiface, havedefault = extinfo[:3]
+            if '%' in host:
+                ifidx = host.split('%', 1)[1]
+                with open('/tmp/confluent.ifidx', 'w+') as ifout:
+                    ifout.write(ifidx)
+            self.hosts.append(host)
             try:
                 info = open('/etc/confluent/confluent.deploycfg').read().split('\n')
             except Exception:
@@ -278,11 +266,7 @@ class HTTPSClient(client.HTTPConnection, object):
                 for line in info:
                     if line.startswith('deploy_server: ') or line.startswith('deploy_server_v6: '):
                         self.hosts.append(line.split(': ', 1)[1])
-        if self.phmac:
-            with open(phmac, 'r') as hmacin:
-                self.stdheaders['CONFLUENT_CRYPTHMAC'] = hmacin.read()
-        else:
-            self.stdheaders['CONFLUENT_APIKEY'] = get_apikey(node, self.hosts, errout=self.errout)
+        self.stdheaders['CONFLUENT_APIKEY'] = get_apikey(node, self.hosts, errout=self.errout)
         if mgtiface:
             self.stdheaders['CONFLUENT_MGTIFACE'] = mgtiface
         self.port = port
@@ -419,19 +403,6 @@ if __name__ == '__main__':
         errout = sys.argv.pop(errout)
     except ValueError:
         errout = None
-    try:
-        phmac = sys.argv.index('-p')
-        sys.argv.pop(phmac)
-        phmac = sys.argv.pop(phmac)
-    except ValueError:
-        phmac = None
-    try:
-        checkonly = False
-        idxit = sys.argv.index('-c')
-        sys.argv.pop(idxit)
-        checkonly = True
-    except Exception:
-        pass
     if len(sys.argv) > 2 and os.path.exists(sys.argv[-1]):
         data = open(sys.argv[-1]).read()
     if outbin:
@@ -443,13 +414,11 @@ if __name__ == '__main__':
                 outf.write(chunk)
                 chunk = reader.read(16384)
         sys.exit(0)
-    client = HTTPSClient(usejson, errout=errout, phmac=phmac)
     if waitfor:
+        client = HTTPSClient(usejson, errout=errout)
         status = 201
         while status != waitfor:
             status, rsp = client.grab_url_with_status(sys.argv[1], data)
             sys.stdout.write(rsp.decode())
-    elif checkonly:
-        sys.stdout.write(client.check_connections())
     else:
-        sys.stdout.write(client.grab_url(sys.argv[1], data).decode())
+        sys.stdout.write(HTTPSClient(usejson, errout=errout).grab_url(sys.argv[1], data).decode())

confluent_osdeploy/common/profile/scripts/confignet

@@ -25,8 +25,6 @@ def add_lla(iface, mac):
     initbyte = int(pieces[0], 16) ^ 2
     lla = 'fe80::{0:x}{1}:{2}ff:fe{3}:{4}{5}/64'.format(initbyte, pieces[1], pieces[2], pieces[3], pieces[4], pieces[5])
     try:
-        with open('/proc/sys/net/ipv6/conf/{0}/disable_ipv6'.format(iface), 'w') as setin:
-            setin.write('0')
         subprocess.check_call(['ip', 'addr', 'add', 'dev', iface, lla, 'scope', 'link'])
     except Exception:
         return None
@@ -156,14 +154,12 @@ class WickedManager(object):
                 sys.stderr.write("Warning, multiple interfaces ({0}) without a team_mode, skipping setup\n".format(','.join(cfg['interfaces'])))
                 return
             if not stgs.get('connection_name', None):
-                stgs['connection_name'] = 'bond{0}'.format(self.teamidx)
+                stgs['connection_name'] = 'team{0}'.format(self.teamidx)
                 self.teamidx += 1
             cname = stgs['connection_name']
             with open('/etc/sysconfig/network/ifcfg-{0}'.format(cname), 'w') as teamout:
                 teamout.write(ipcfg)
-                if stgs['team_mode'] == 'lacp':
-                    stgs['team_mode'] = '802.3ad'
-                teamout.write("BONDING_MODULE_OPTS='mode={0} miimon=100'\nBONDING_MASTER=yes\n".format(stgs['team_mode']))
+                teamout.write('TEAM_RUNNER={0}\n'.format(stgs['team_mode']))
                 idx = 1
                 for iface in cfg['interfaces']:
                     subprocess.call(['wicked', 'ifdown', iface])
@@ -172,7 +168,7 @@ class WickedManager(object):
                         os.remove('/etc/sysconfig/network/ifroute-{0}'.format(iface))
                     except OSError:
                         pass
-                    teamout.write('BONDING_SLAVE{0}={1}\n'.format(idx, iface))
+                    teamout.write('TEAM_PORT_DEVICE_{0}={1}\n'.format(idx, iface))
                     idx += 1
         else:
             cname = list(cfg['interfaces'])[0]
@@ -329,20 +325,18 @@ if __name__ == '__main__':
         nc = json.loads(nc)
         iname = get_interface_name(idxmap[curridx], nc.get('default', {}))
         if iname:
-            for iname in iname.split(','):
-                if 'default' in netname_to_interfaces:
-                    netname_to_interfaces['default']['interfaces'].add(iname)
-                else:
-                    netname_to_interfaces['default'] = {'interfaces': set([iname]), 'settings': nc['default']}
+            if 'default' in netname_to_interfaces:
+                netname_to_interfaces['default']['interfaces'].add(iname)
+            else:
+                netname_to_interfaces['default'] = {'interfaces': set([iname]), 'settings': nc['default']}
         for netname in nc.get('extranets', {}):
             uname = '_' + netname
             iname = get_interface_name(idxmap[curridx], nc['extranets'][netname])
             if iname:
-                for iname in iname.split(','):
-                    if uname in netname_to_interfaces:
-                        netname_to_interfaces[uname]['interfaces'].add(iname)
-                    else:
-                        netname_to_interfaces[uname] = {'interfaces': set([iname]), 'settings': nc['extranets'][netname]}
+                if uname in netname_to_interfaces:
+                    netname_to_interfaces[uname]['interfaces'].add(iname)
+                else:
+                    netname_to_interfaces[uname] = {'interfaces': set([iname]), 'settings': nc['extranets'][netname]}
         doneidxs.add(curridx)
     rm_tmp_llas(tmpllas)
     if os.path.exists('/usr/bin/nmcli'):

confluent_osdeploy/confluent_osdeploy.spec.tmpl

@@ -29,7 +29,8 @@ cp confluent_imginfo copernicus clortho autocons ../opt/confluent/bin
 cp start_root urlmount ../stateless-bin/
 cd ..
 ln -s el8 el9
-for os in rhvh4 el7 genesis el8 suse15 ubuntu20.04 ubuntu22.04 coreos el9; do
+ln -s el8-diskless el9-diskless
+for os in rhvh4 el7 genesis el8 suse15 ubuntu20.04 coreos el9; do
     mkdir ${os}out
     cd ${os}out
     if [ -d ../${os}bin ]; then 
@@ -73,13 +74,9 @@ mv ../addons.tgz .
 cd ..
 cp -a esxi7out esxi6out
 cp -a esxi7 esxi6
-cp -a esxi7out esxi8out
-cp -a esxi7 esxi8
 
 %install
-mkdir -p %{buildroot}/opt/confluent/share/licenses/confluent_osdeploy/
-cp LICENSE %{buildroot}/opt/confluent/share/licenses/confluent_osdeploy/
-for os in rhvh4 el7 el8 el9 genesis suse15 ubuntu20.04 ubuntu22.04 esxi6 esxi7 esxi8 coreos; do
+for os in rhvh4 el7 el8 el9 genesis suse15 ubuntu20.04 esxi6 esxi7 coreos; do
     mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/$os/initramfs
     mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/$os/profiles
     cp ${os}out/addons.* %{buildroot}/opt/confluent/lib/osdeploy/$os/initramfs
@@ -101,4 +98,3 @@ find %{buildroot}/opt/confluent/lib/osdeploy/ -name .gitignore -exec rm -f {} +
 
 %files
 /opt/confluent/lib/osdeploy
-%license /opt/confluent/share/licenses/confluent_osdeploy/LICENSE

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

@@ -5,55 +5,6 @@ umask 0077
 mkdir -p /etc/confluent
 echo -n > /etc/confluent/confluent.info
 umask $oum
-if [ -e /dev/disk/by-label/CNFLNT_IDNT ]; then
-    tmnt=$(mktemp -d)
-    tcfg=$(mktemp)
-    mount /dev/disk/by-label/CNFLNT_IDNT $tmnt
-    cd $tmnt
-    deploysrvs=$(sed -n '/^deploy_servers:/, /^[^-]/p' cnflnt.yml |grep ^-|sed -e 's/^- //'|grep -v :)
-    nodename=$(grep ^nodename: cnflnt.yml|awk '{print $2}')
-    sed -n '/^net_cfgs:/, /^[^- ]/{/^[^- ]/!p}' cnflnt.yml |sed -n '/^-/, /^-/{/^-/!p}'| sed -e 's/^[- ]*//'> $tcfg
-    autoconfigmethod=$(grep ^ipv4_method: $tcfg)
-    autoconfigmethod=${autoconfigmethod#ipv4_method: }
-    if [ "$autoconfigmethod" = "dhcp" ]; then
-        /usr/libexec/nm-initrd-generator ip=:dhcp
-    else
-        v4addr=$(grep ^ipv4_address: $tcfg)
-        v4addr=${v4addr#ipv4_address: }
-        v4addr=${v4addr%/*}
-        v4gw=$(grep ^ipv4_gateway: $tcfg)
-        v4gw=${v4gw#ipv4_gateway: }
-        if [ "$v4gw" = "null" ]; then
-            v4gw=""
-        fi
-        v4nm=$(grep ipv4_netmask: $tcfg)
-        v4nm=${v4nm#ipv4_netmask: }
-        /usr/libexec/nm-initrd-generator ip=$v4addr::$v4gw:$v4nm:$hostname::none
-    fi
-    NetworkManager --configure-and-quit=initrd --no-daemon
-    hmackeyfile=$(mktemp)
-    echo -n $(grep ^apitoken: cnflnt.yml|awk '{print $2}') > $hmackeyfile
-    cd -
-    umount $tmnt
-    passfile=$(mktemp)
-    passcrypt=$(mktemp)
-    hmacfile=$(mktemp)
-    ln -s /opt/confluent/bin/clortho /opt/confluent/bin/genpasshmac
-    /opt/confluent/bin/genpasshmac $passfile $passcrypt $hmacfile $hmackeyfile
-    for deployer in $deploysrvs; do
-        if curl -f -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_CRYPTHMAC: $(cat $hmacfile)" -d@$passcrypt -k https://$deployer/confluent-api/self/registerapikey; then
-            cp $passfile /etc/confluent/confluent.apikey
-            confluent_apikey=$(cat /etc/confluent/confluent.apikey)
-            curl -sf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" https://$deployer/confluent-api/self/deploycfg > /etc/confluent/confluent.deploycfg
-            curl -sf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" https://$deployer/confluent-api/self/profileprivate/pending/config.ign > /config.ign
-            [ -s /config.ign ] || rm /config.ign
-            confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg)
-            confluent_profile=${confluent_profile#profile: }
-            curl -sf https://$deployer/confluent-public/os/$confluent_profile/rootfs.img | rdcore stream-hash /etc/coreos-live-want-rootfs | bsdtar -xf - -C /
-            exit 0
-        fi
-    done
-fi
 cd /sys/class/net
 echo "Searching for confluent deployment server...." > /dev/console
 while ! grep ^NODE /etc/confluent/confluent.info; do
@@ -67,7 +18,6 @@ while ! grep ^NODE /etc/confluent/confluent.info; do
     if ! grep ^NODE /etc/confluent/confluent.info; then
         echo 'Current net config:' > /dev/console
         ip -br a > /dev/console
-        exit 1
     fi
 done
 echo "Found confluent deployment services on local network" > /dev/console
@@ -115,7 +65,7 @@ curl -sf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_api
 [ -s /config.ign ] || rm /config.ign
 
 umask $oldumask
-autoconfigmethod=$(grep ^ipv4_method: /etc/confluent/confluent.deploycfg)
+autoconfigmethod=$(grep ipv4_method /etc/confluent/confluent.deploycfg)
 autoconfigmethod=${autoconfigmethod#ipv4_method: }
 confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg)
 confluent_profile=${confluent_profile#profile: }

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

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

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

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

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

@@ -11,10 +11,11 @@ confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg|awk '{pr
 confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 export nodename confluent_mgr confluent_profile
 . /etc/confluent/functions
-(
 exec >> /var/log/confluent/confluent-firstboot.log
 exec 2>> /var/log/confluent/confluent-firstboot.log
 chmod 600 /var/log/confluent/confluent-firstboot.log
+tail -f /var/log/confluent/confluent-firstboot.log > /dev/console &
+logshowpid=$!
 while ! ping -c 1 $confluent_mgr >& /dev/null; do
 	sleep 1
 done
@@ -36,5 +37,4 @@ curl -X POST -d 'status: complete' -H "CONFLUENT_NODENAME: $nodename" -H "CONFLU
 systemctl disable firstboot
 rm /etc/systemd/system/firstboot.service
 rm /etc/confluent/firstboot.ran
-) &
-tail --pid  $! -F /var/log/confluent/confluent-firstboot.log > /dev/console
+kill $logshowpid

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

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

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

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

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

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

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

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

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

@@ -20,4 +20,3 @@ for i in /ssh/*.ca; do
 done
 mkdir -p /sysroot/opt/confluent/bin
 cp /opt/confluent/bin/apiclient /sysroot/opt/confluent/bin
-cp /opt/confluent/bin/apiclient /sysroot/etc/confluent/

confluent_osdeploy/el7/profiles/default/scripts/functions

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

confluent_osdeploy/el7/profiles/default/scripts/getinstalldisk

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

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

@@ -79,9 +79,5 @@ if [ -e /tmp/installdisk -a ! -e /tmp/partitioning ]; then
     echo ignoredisk --only-use $(cat /tmp/installdisk) >> /tmp/partitioning
     echo autopart --nohome $LUKSPARTY >> /tmp/partitioning
 fi
-if [ -f /opt/confluent/bin/apiclient ]; then
-    python /opt/confluent/bin/apiclient /confluent-public/os/$confluent_profile/kickstart.custom -o /tmp/kickstart.custom
-else
-    python /etc/confluent/apiclient /confluent-public/os/$confluent_profile/kickstart.custom -o /tmp/kickstart.custom
-fi
+python /etc/confluent/apiclient /confluent-public/os/$confluent_profile/kickstart.custom -o /tmp/kickstart.custom
 kill $logshowpid

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

@@ -10,8 +10,6 @@
 nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
 export confluent_mgr confluent_profile nodename
 cp -a /etc/confluent /mnt/sysimage/etc
-mkdir -p /mnt/sysimage/opt/confluent/bin
-cp /opt/confluent/bin/apiclient /mnt/sysimage/opt/confluent/bin/
 chmod -R og-rwx /mnt/sysimage/etc/confluent
 cp /tmp/functions /mnt/sysimage/etc/confluent/
 hostnamectl set-hostname $nodename

confluent_osdeploy/el7/profiles/default/scripts/syncfileclient

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

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

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

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

@@ -1,43 +0,0 @@
-try:
-    import configparser
-except ImportError:
-    import ConfigParser as configparser
-    import cStringIO
-import imp
-import sys
-apiclient = imp.load_source('apiclient', '/opt/confluent/bin/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')

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

@@ -11,10 +11,11 @@ confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg|awk '{pr
 confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 export nodename confluent_mgr confluent_profile
 . /etc/confluent/functions
-(
 exec >> /var/log/confluent/confluent-firstboot.log
 exec 2>> /var/log/confluent/confluent-firstboot.log
 chmod 600 /var/log/confluent/confluent-firstboot.log
+tail -f /var/log/confluent/confluent-firstboot.log > /dev/console &
+logshowpid=$!
 while ! ping -c 1 $confluent_mgr >& /dev/null; do
 	sleep 1
 done
@@ -36,5 +37,4 @@ curl -X POST -d 'status: complete' -H "CONFLUENT_NODENAME: $nodename" -H "CONFLU
 systemctl disable firstboot
 rm /etc/systemd/system/firstboot.service
 rm /etc/confluent/firstboot.ran
-) &
-tail --pid  $! -F /var/log/confluent/confluent-firstboot.log > /dev/console
+kill $logshowpid

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

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

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

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

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

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

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

@@ -7,15 +7,8 @@
 
 nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
 confluent_apikey=$(cat /etc/confluent/confluent.apikey)
-v4meth=$(grep ^ipv4_method: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-if [ "$v4meth" = "null" -o -z "$v4meth" ]; then
-    confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-fi
-if [ -z "$confluent_mgr" ]; then
-    confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-fi
+confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-timedatectl set-timezone $(grep ^timezone: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 export nodename confluent_mgr confluent_profile
 . /etc/confluent/functions
 mkdir -p /var/log/confluent
@@ -26,9 +19,6 @@ chmod 600 /var/log/confluent/confluent-onboot.log
 tail -f /var/log/confluent/confluent-onboot.log > /dev/console &
 logshowpid=$!
 
-rpm --import /etc/pki/rpm-gpg/*
-
-run_remote_python add_local_repositories
 run_remote_python syncfileclient
 run_remote_python confignet
 

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

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

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

@@ -19,6 +19,5 @@ mkdir -p /sysroot/etc/ssh/
 for i in /ssh/*.ca; do
     echo '@cert-authority *' $(cat $i) >> /sysroot/etc/ssh/ssh_known_hosts
 done
-mkdir -p /sysroot/opt/confluent/bin
+mkdir -p /sysroot/opt/confuent/bin
 cp /opt/confluent/bin/apiclient /sysroot/opt/confluent/bin
-cp /opt/confluent/bin/apiclient /sysroot/etc/confluent/

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

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

confluent_osdeploy/el8/profiles/default/kickstart

@@ -59,8 +59,7 @@ v4cfg=${v4cfg#ipv4_method: }
 if [ "$v4cfg" = "static" ] || [ "$v4cfg" = "dhcp" ]; then
     confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server: }
-fi
-if [ -z "$confluent_mgr" ]; then
+else
     confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server_v6: }
     confluent_mgr="[$confluent_mgr]"
@@ -78,8 +77,7 @@ v4cfg=${v4cfg#ipv4_method: }
 if [ "$v4cfg" = "static" ] || [ "$v4cfg" = "dhcp" ]; then
     confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server: }
-fi
-if [ -z "$confluent_mgr" ]; then
+else
     confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server_v6: }
     confluent_mgr="[$confluent_mgr]"
@@ -106,8 +104,7 @@ v4cfg=${v4cfg#ipv4_method: }
 if [ "$v4cfg" = "static" ] || [ "$v4cfg" = "dhcp" ]; then
     confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server: }
-fi
-if [ -z "$confluent_mgr" ]; then
+else
     confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server_v6: }
     confluent_mgr="[$confluent_mgr]"

confluent_osdeploy/el8/profiles/default/scripts/add_local_repositories

@@ -3,13 +3,9 @@ try:
 except ImportError:
     import ConfigParser as configparser
     import cStringIO
-import importlib.util
-import importlib.machinery
+import imp
 import sys
-modloader = importlib.machinery.SourceFileLoader('apiclient', '/opt/confluent/bin/apiclient')
-modspec = importlib.util.spec_from_file_location('apiclient', '/opt/confluent/bin/apiclient', loader=modloader)
-apiclient = importlib.util.module_from_spec(modspec)
-modspec.loader.exec_module(apiclient)
+apiclient = imp.load_source('apiclient', '/etc/confluent/apiclient')
 repo = None
 server = None
 profile = None

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

@@ -13,8 +13,7 @@ if [ "$v4cfg" = "static" ] || [ "$v4cfg" = "dhcp" ]; then
     confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server: }
     confluent_pingtarget=$confluent_mgr
-fi
-if [ -z "$confluent_mgr" ]; then
+else
     confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server_v6: }
     confluent_pingtarget=$confluent_mgr
@@ -23,10 +22,11 @@ fi
 confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|awk '{print $2}')
 export nodename confluent_mgr confluent_profile
 . /etc/confluent/functions
-(
 exec >> /var/log/confluent/confluent-firstboot.log
 exec 2>> /var/log/confluent/confluent-firstboot.log
 chmod 600 /var/log/confluent/confluent-firstboot.log
+tail -f /var/log/confluent/confluent-firstboot.log > /dev/console &
+logshowpid=$!
 while ! ping -c 1 $confluent_pingtarget >& /dev/null; do
 	sleep 1
 done
@@ -49,5 +49,4 @@ curl -X POST -d 'status: complete' -H "CONFLUENT_NODENAME: $nodename" -H "CONFLU
 systemctl disable firstboot
 rm /etc/systemd/system/firstboot.service
 rm /etc/confluent/firstboot.ran
-) &
-tail --pid $! -n 0 -F /var/log/confluent/confluent-firstboot.log > /dev/console
+kill $logshowpid

confluent_osdeploy/el8/profiles/default/scripts/functions

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

confluent_osdeploy/el8/profiles/default/scripts/getinstalldisk

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

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

@@ -42,20 +42,11 @@ echo lang $locale > /tmp/langinfo
 echo keyboard --vckeymap=$keymap >> /tmp/langinfo
 tz=$(grep ^timezone: /etc/confluent/confluent.deploycfg)
 tz=${tz#timezone: }
-MVER=$(grep VERSION_ID /etc/os-release|cut -d = -f 2 |cut -d . -f 1|cut -d '"' -f 2)
 ntpsrvs=""
-if [ "$MVER" -ge 9 ]; then
-    if grep ^ntpservers: /etc/confluent/confluent.deploycfg > /dev/null; then
-	for ntpsrv in $(sed -n '/^ntpservers:/,/^[^-]/p' /etc/confluent/confluent.deploycfg|sed 1d|sed '$d' | sed -e 's/^- //'); do
-	    echo timesource --ntp-server $ntpsrv >> /tmp/timezone
-        done
-    fi
-else
-    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
+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
+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
@@ -97,7 +88,7 @@ fi
 export confluent_mgr confluent_profile nodename
 curl -sf https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/functions > /tmp/functions
 . /tmp/functions
-confluentpython /opt/confluent/bin/apiclient /confluent-public/os/$confluent_profile/kickstart.custom -o /tmp/kickstart.custom
+confluentpython /etc/confluent/apiclient /confluent-public/os/$confluent_profile/kickstart.custom -o /tmp/kickstart.custom
 run_remote pre.custom
 run_remote_parts pre.d
 confluentpython /etc/confluent/apiclient /confluent-public/os/$confluent_profile/kickstart -o /tmp/kickstart.base

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

@@ -10,8 +10,6 @@
 nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
 export confluent_mgr confluent_profile nodename
 cp -a /etc/confluent /mnt/sysimage/etc
-mkdir -p /mnt/sysimage/opt/confluent/bin
-cp /opt/confluent/bin/apiclient /mnt/sysimage/opt/confluent/bin/
 chmod -R og-rwx /mnt/sysimage/etc/confluent
 cp /tmp/functions /mnt/sysimage/etc/confluent/
 hostnamectl set-hostname $nodename

confluent_osdeploy/el8/profiles/default/scripts/syncfileclient

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

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

@@ -1,309 +0,0 @@
-get_remote_apikey() {
-    while [ -z "$confluent_apikey" ]; do
-        /opt/confluent/bin/clortho $nodename $confluent_mgr > /etc/confluent/confluent.apikey
-        if grep ^SEALED: /etc/confluent/confluent.apikey > /dev/null; then
-            # we don't support remote sealed api keys anymore
-            echo > /etc/confluent/confluent.apikey
-        fi
-        confluent_apikey=$(cat /etc/confluent/confluent.apikey)
-        if [ -z "$confluent_apikey" ]; then
-            echo "Unable to acquire node api key, set deployment.apiarmed=once on node '$nodename', retrying..."
-            if [ ! -z "$autoconsdev" ]; then echo "Unable to acquire node api key, set deployment.apiarmed=once on node '$nodename', retrying..." > $autoconsdev; fi
-            sleep 10
-        elif [ -c /dev/tpmrm0 ]; then
-            tmpdir=$(mktemp -d)
-            cd $tmpdir
-            tpm2_startauthsession --session=session.ctx
-            tpm2_policypcr -Q --session=session.ctx --pcr-list="sha256:15" --policy=pcr15.sha256.policy
-            tpm2_createprimary -G ecc -Q --key-context=prim.ctx
-            (echo -n "CONFLUENT_APIKEY:";cat /etc/confluent/confluent.apikey) | tpm2_create -Q --policy=pcr15.sha256.policy --public=data.pub --private=data.priv -i - -C prim.ctx
-            tpm2_load -Q --parent-context=prim.ctx --public=data.pub --private=data.priv --name=confluent.apikey --key-context=data.ctx
-            tpm2_evictcontrol -Q -c data.ctx
-            tpm2_flushcontext session.ctx
-            cd - > /dev/null
-            rm -rf $tmpdir
-        fi
-    done
-}
-root=1
-rootok=1
-netroot=confluent
-echo -ne '\033[H\033[2J\033[3J'
-mkdir -p /etc/ssh
-mkdir -p /var/tmp/
-mkdir -p /var/empty/sshd
-mkdir -p /usr/share/empty.sshd
-mkdir -p /etc/confluent
-sed -i '/^root:x/d' /etc/passwd
-echo root:x:0:0::/:/bin/bash >> /etc/passwd
-echo sshd:x:30:30:SSH User:/var/empty/sshd:/sbin/nologin >> /etc/passwd
-
-if ! grep console= /proc/cmdline >& /dev/null; then
-    autocons=$(/opt/confluent/bin/autocons)
-    autoconsdev=${autocons%,*}
-    autocons=${autocons##*/}
-    echo "Automatic console configured for $autocons"
-fi
-echo "Initializing confluent diskless environment"
-echo -n "udevd: "
-/usr/lib/systemd/systemd-udevd --daemon
-echo -n "Loading drivers..."
-udevadm trigger
-udevadm trigger --type=devices --action=add
-udevadm settle
-modprobe ib_ipoib
-modprobe ib_umad
-modprobe hfi1
-modprobe mlx5_ib
-echo "done"
-cat > /etc/ssh/sshd_config << EOF
-Port 2222
-Subsystem       sftp    /usr/libexec/openssh/sftp-server
-PermitRootLogin yes
-AuthorizedKeysFile      .ssh/authorized_keys
-EOF
-mkdir /root/.ssh
-mkdir /.ssh
-cat /ssh/*pubkey > /root/.ssh/authorized_keys 2>/dev/null
-cp /root/.ssh/authorized_keys /.ssh/
-cat /tls/*.pem > /etc/confluent/ca.pem
-mkdir -p /etc/pki/tls/certs
-cat /tls/*.pem > /etc/pki/tls/certs/ca-bundle.crt
-TRIES=0
-oldumask=$(umask)
-umask 0077
-tpmdir=$(mktemp -d)
-cd $tpmdir
-lasthdl=""
-if [ -c /dev/tpmrm0 ]; then
-    for hdl in $(tpm2_getcap handles-persistent|awk '{print $2}'); do
-        tpm2_startauthsession --policy-session --session=session.ctx
-        tpm2_policypcr -Q --session=session.ctx --pcr-list="sha256:15" --policy=pcr15.sha256.policy
-        unsealeddata=$(tpm2_unseal --auth=session:session.ctx -Q -c $hdl 2>/dev/null)
-        tpm2_flushcontext session.ctx
-        if [[ $unsealeddata == "CONFLUENT_APIKEY:"* ]]; then
-            confluent_apikey=${unsealeddata#CONFLUENT_APIKEY:}
-            echo $confluent_apikey > /etc/confluent/confluent.apikey
-            if [ -n "$lasthdl" ]; then
-                tpm2_evictcontrol -c $lasthdl
-            fi
-            lasthdl=$hdl
-        fi
-    done
-fi
-cd - > /dev/null
-rm -rf $tpmdir
-touch /etc/confluent/confluent.info
-cd /sys/class/net
-echo -n "Scanning for network configuration..."
-while ! grep ^EXTMGRINFO: /etc/confluent/confluent.info | awk -F'|' '{print $3}' | grep 1 >& /dev/null && [ "$TRIES" -lt 30 ]; do
-    TRIES=$((TRIES + 1))
-    for i in *; do
-        ip link set $i up
-    done
-    /opt/confluent/bin/copernicus -t > /etc/confluent/confluent.info
-done
-cd /
-nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
-hostname $nodename
-confluent_mgr=$(grep '^EXTMGRINFO:.*1$' /etc/confluent/confluent.info | head -n 1 | awk -F': ' '{print $2}' | awk -F'|' '{print $1}')
-if [ -z "$confluent_mgr" ]; then
-    confluent_mgr=$(grep ^MANAGER: /etc/confluent/confluent.info|head -n 1 | awk '{print $2}')
-fi
-if [[ $confluent_mgr == *%* ]]; then
-    echo $confluent_mgr | awk -F% '{print $2}' > /tmp/confluent.ifidx
-    ifidx=$(cat /tmp/confluent.ifidx)
-    ifname=$(ip link |grep ^$ifidx:|awk '{print $2}')
-    ifname=${ifname%:}
-fi
-
-ready=0
-while [ $ready = "0" ]; do
-    get_remote_apikey
-    if [[ $confluent_mgr == *:* ]]; then
-        confluent_mgr="[$confluent_mgr]"
-    fi
-    tmperr=$(mktemp)
-    curl -sSf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" https://$confluent_mgr/confluent-api/self/deploycfg2 > /etc/confluent/confluent.deploycfg 2> $tmperr
-    if grep 401 $tmperr > /dev/null; then
-        confluent_apikey=""
-        if [ -n "$lasthdl" ]; then
-            tpm2_evictcontrol -c $lasthdl
-        fi
-        confluent_mgr=${confluent_mgr#[}
-        confluent_mgr=${confluent_mgr%]}
-    elif grep 'SSL' $tmperr > /dev/null; then
-        confluent_mgr=${confluent_mgr#[}
-        confluent_mgr=${confluent_mgr%]}
-    	echo 'Failure establishing TLS conneection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)'
-	if [ ! -z "$autoconsdev" ]; then echo 'Failure establishing TLS conneection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' > $autoconsdev; fi
-    	sleep 10
-    else
-        ready=1
-    fi
-    rm $tmperr
-done
-if [ ! -z "$autocons" ] && grep "textconsole: true" /etc/confluent/confluent.deploycfg > /dev/null; then /opt/confluent/bin/autocons -c > /dev/null; fi
-if [ -c /dev/tpmrm0 ]; then
-    tpm2_pcrextend 15:sha256=2fbe96c50dde38ce9cd2764ddb79c216cfbcd3499568b1125450e60c45dd19f2
-fi
-umask $oldumask
-mkdir -p /run/NetworkManager/system-connections
-cat > /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-[connection]
-EOC
-echo id=${ifname} >> /run/NetworkManager/system-connections/$ifname.nmconnection
-echo uuid=$(uuidgen) >> /run/NetworkManager/system-connections/$ifname.nmconnection
-cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-type=ethernet
-autoconnect-retries=1
-EOC
-echo interface-name=$ifname >> /run/NetworkManager/system-connections/$ifname.nmconnection
-cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-multi-connect=1
-permissions=
-wait-device-timeout=60000
-
-[ethernet]
-mac-address-blacklist=
-
-EOC
-autoconfigmethod=$(grep ^ipv4_method: /etc/confluent/confluent.deploycfg |awk '{print $2}')
-auto6configmethod=$(grep ^ipv6_method: /etc/confluent/confluent.deploycfg |awk '{print $2}')
-if [ "$autoconfigmethod" = "dhcp" ]; then
-    echo -n "Attempting to use dhcp to bring up $ifname..."
-    dhclient $ifname
-    echo "Complete:"
-    ip addr show dev $ifname
-    confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg| awk '{print $2}')
-elif [ "$autoconfigmethod" = "static" ]; then
-    confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg| awk '{print $2}')
-    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 ^prefix: /etc/confluent/confluent.deploycfg)
-    v4nm=${v4nm#prefix: }
-    echo "Setting up $ifname as static at $v4addr/$v4nm"
-    ip addr add dev $ifname $v4addr/$v4nm
-    if [ ! -z "$v4gw" ]; then
-        ip route add default via $v4gw
-    fi
-    echo '[ipv4]' >> /run/NetworkManager/system-connections/$ifname.nmconnection
-    echo address1=$v4addr/$v4nm >> /run/NetworkManager/system-connections/$ifname.nmconnection
-    if [ ! -z "$v4gw" ]; then
-        echo gateway=$v4gw >> /run/NetworkManager/system-connections/$ifname.nmconnection
-    fi
-    nameserversec=0
-    nameservers=""
-    while read -r entry; do
-        if [ $nameserversec = 1 ]; then
-            if [[ $entry == "-"*.* ]]; then
-                nameservers="$nameservers"${entry#- }";"
-                continue
-            fi
-        fi
-        nameserversec=0
-        if [ "${entry%:*}" = "nameservers" ]; then
-            nameserversec=1
-            continue
-        fi
-    done < /etc/confluent/confluent.deploycfg
-    echo dns=$nameservers >> /run/NetworkManager/system-connections/$ifname.nmconnection
-    dnsdomain=$(grep ^dnsdomain: /etc/confluent/confluent.deploycfg)
-    dnsdomain=${dnsdomain#dnsdomain: }
-    echo dns-search=$dnsdomain >> /run/NetworkManager/system-connections/$ifname.nmconnection
-    cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-may-fail=false
-method=manual
-
-[ipv6]
-addr-gen-mode=eui64
-method=auto
-
-EOC
-elif [ "$auto6configmethod" = "static" ]; then
-    confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg| awk '{print $2}')
-    v6addr=$(grep ^ipv6_address: /etc/confluent/confluent.deploycfg)
-    v6addr=${v6addr#ipv6_address: }
-    v6gw=$(grep ^ipv6_gateway: /etc/confluent/confluent.deploycfg)
-    v6gw=${v6gw#ipv6_gateway: }
-    if [ "$v6gw" = "null" ]; then
-        v6gw=""
-    fi
-    v6nm=$(grep ^ipv6_prefix: /etc/confluent/confluent.deploycfg)
-    v6nm=${v6nm#ipv6_prefix: }
-    echo "Setting up $ifname as static at $v6addr/$v6nm"
-    ip addr add dev $ifname $v6addr/$v6nm
-
-    cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-[ipv4]
-dhcp-timeout=90
-dhcp-vendor-class-identifier=anaconda-Linux
-method=disabled
-
-[ipv6]
-addr-gen-mode=eui64
-method=manual
-may-fail=false
-EOC
-    echo address1=$v6addr/$v6nm >> /run/NetworkManager/system-connections/$ifname.nmconnection
-    if [ ! -z "$v6gw" ]; then
-        ip route add default via $v6gw
-        echo gateway=$v6gw >> /run/NetworkManager/system-connections/$ifname.nmconnection
-    fi
-    nameserversec=0
-    nameservers=""
-    while read -r entry; do
-        if [ $nameserversec = 1 ]; then
-            if [[ $entry == "-"*:* ]]; then
-                nameservers="$nameservers"${entry#- }";"
-                continue
-            fi
-        fi
-        nameserversec=0
-        if [ "${entry%:*}" = "nameservers" ]; then
-            nameserversec=1
-            continue
-        fi
-    done < /etc/confluent/confluent.deploycfg
-    echo dns=$nameservers >> /run/NetworkManager/system-connections/$ifname.nmconnection
-    dnsdomain=$(grep ^dnsdomain: /etc/confluent/confluent.deploycfg)
-    dnsdomain=${dnsdomain#dnsdomain: }
-    echo dns-search=$dnsdomain >> /run/NetworkManager/system-connections/$ifname.nmconnection
-fi
-echo '[proxy]' >> /run/NetworkManager/system-connections/$ifname.nmconnection
-chmod 600 /run/NetworkManager/system-connections/*.nmconnection
-confluent_websrv=$confluent_mgr
-if [[ $confluent_websrv == *:* ]]; then
-    confluent_websrv="[$confluent_websrv]"
-fi
-echo -n "Initializing ssh..."
-ssh-keygen -A
-for pubkey in /etc/ssh/ssh_host*key.pub; do
-    certfile=${pubkey/.pub/-cert.pub}
-    privfile=${pubkey%.pub}
-    curl -sf -X POST -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" -d @$pubkey  https://$confluent_websrv/confluent-api/self/sshcert > $certfile
-    if [ -s $certfile ]; then
-        echo HostCertificate $certfile >> /etc/ssh/sshd_config
-    fi
-    echo HostKey $privfile >> /etc/ssh/sshd_config
-done
-/usr/sbin/sshd
-confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg| awk '{print $2}')
-confluent_proto=$(grep ^protocol: /etc/confluent/confluent.deploycfg| awk '{print $2}')
-confluent_urls=""
-for addr in $(grep ^MANAGER: /etc/confluent/confluent.info|awk '{print $2}'|sed -e s/%/%25/); do
-    if [[ $addr == *:* ]]; then
-        confluent_urls="$confluent_urls $confluent_proto://[$addr]/confluent-public/os/$confluent_profile/rootimg.sfs"
-    else
-        confluent_urls="$confluent_urls $confluent_proto://$addr/confluent-public/os/$confluent_profile/rootimg.sfs"
-    fi
-done
-mkdir -p /etc/confluent
-curl -sf https://$confluent_websrv/confluent-public/os/$confluent_profile/scripts/functions > /etc/confluent/functions
-. /etc/confluent/functions
-source_remote imageboot.sh

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

@@ -1,47 +0,0 @@
-try:
-    import configparser
-except ImportError:
-    import ConfigParser as configparser
-    import cStringIO
-import importlib.util
-import importlib.machinery
-import sys
-modloader = importlib.machinery.SourceFileLoader('apiclient', '/opt/confluent/bin/apiclient')
-modspec = importlib.util.spec_from_file_location('apiclient', '/opt/confluent/bin/apiclient', loader=modloader)
-apiclient = importlib.util.module_from_spec(modspec)
-modspec.loader.exec_module(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')

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

@@ -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.

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

@@ -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
-

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

@@ -1,40 +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}')
-confluent_apikey=$(cat /etc/confluent/confluent.apikey)
-confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-export nodename confluent_mgr confluent_profile
-. /etc/confluent/functions
-(
-exec >> /var/log/confluent/confluent-firstboot.log
-exec 2>> /var/log/confluent/confluent-firstboot.log
-chmod 600 /var/log/confluent/confluent-firstboot.log
-while ! ping -c 1 $confluent_mgr >& /dev/null; do
-	sleep 1
-done
-
-if [ ! -f /etc/confluent/firstboot.ran ]; then
-    touch /etc/confluent/firstboot.ran
-
-    cat /etc/confluent/tls/*.pem >> /etc/pki/tls/certs/ca-bundle.crt
-
-    run_remote firstboot.custom
-    # Firstboot scripts may be placed into firstboot.d, e.g. firstboot.d/01-firstaction.sh, firstboot.d/02-secondaction.sh
-    run_remote_parts firstboot.d
-
-    # Induce execution of remote configuration, e.g. ansible plays in ansible/firstboot.d/
-    run_remote_config firstboot.d
-fi
-
-curl -X POST -d 'status: complete' -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" https://$confluent_mgr/confluent-api/self/updatestatus
-systemctl disable firstboot
-rm /etc/systemd/system/firstboot.service
-rm /etc/confluent/firstboot.ran
-) &
-tail --pid  $! -F /var/log/confluent/confluent-firstboot.log > /dev/console

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

@@ -1,208 +0,0 @@
-#!/bin/bash
-function test_mgr() {
-    whost=$1
-    if [[ "$whost" == *:* ]]; then
-        whost="[$whost]"
-    fi
-    if curl -s https://${whost}/confluent-api/ > /dev/null; then
-        return 0
-    fi
-    return 1
-}
-
-function confluentpython() {
-    if [ -x /usr/libexec/platform-python ]; then
-        /usr/libexec/platform-python $*
-    elif [ -x /usr/bin/python3 ]; then
-        /usr/bin/python3 $*
-    elif [ -x /usr/bin/python ]; then
-        /usr/bin/python $*
-    elif [ -x /usr/bin/python2 ]; then
-        /usr/bin/python2 $*
-    fi
-}
-
-function set_confluent_vars() {
-    if [ -z "$nodename" ]; then
-        nodename=$(grep ^NODENAME: /etc/confluent/confluent.info | awk '{print $2}')
-    fi
-    if [[ "$confluent_mgr" == *"%"* ]]; then
-        confluent_mgr=""
-    fi
-    if [ -z "$confluent_mgr" ]; then
-        confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg | sed -e 's/[^ ]*: //')
-        if ! test_mgr $confluent_mgr; then
-            confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg | sed -e 's/[^ ]*: //')
-            if [[ "$confluent_mgr" = *":"* ]]; then
-                confluent_mgr="[$confluent_mgr]"
-            fi
-        fi
-        if ! test_mgr $confluent_mgr; then
-            BESTMGRS=$(grep ^EXTMGRINFO: /etc/confluent/confluent.info | grep '|1$' | sed -e 's/EXTMGRINFO: //' -e 's/|.*//')
-            OKMGRS=$(grep ^EXTMGRINFO: /etc/confluent/confluent.info | grep '|0$' | sed -e 's/EXTMGRINFO: //' -e 's/|.*//')
-            for confluent_mgr in $BESTMGRS $OKMGRS; do
-                if [[ $confluent_mgr == *":"* ]]; then
-                    confluent_mgr="[$confluent_mgr]"
-                fi
-                if test_mgr $confluent_mgr; then
-                    break
-                fi
-            done
-        fi
-    fi
-    if [ -z "$confluent_profile" ]; then
-        confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg | sed -e 's/[^ ]*: //')
-    fi
-}
-
-fetch_remote() {
-    curlargs=""
-    if [ -f /etc/confluent/ca.pem ]; then
-        curlargs=" --cacert /etc/confluent/ca.pem"
-    fi
-    set_confluent_vars
-    mkdir -p $(dirname $1)
-    whost=$confluent_mgr
-    if [[ "$whost" == *:* ]]; then
-        whost="[$whost]"
-    fi
-    curl -f -sS $curlargs https://$whost/confluent-public/os/$confluent_profile/scripts/$1 > $1
-    if [ $? != 0 ]; then echo $1 failed to download; return 1; fi
-}
-
-source_remote_parts() {
-    confluentscripttmpdir=$(mktemp -d /tmp/confluentscripts.XXXXXXXXX)
-    apiclient=/opt/confluent/bin/apiclient
-    if [ -f /etc/confluent/apiclient ]; then
-        apiclient=/etc/confluent/apiclient
-    fi
-    scriptlist=$(confluentpython $apiclient /confluent-api/self/scriptlist/$1|sed -e 's/^- //')
-    for script in $scriptlist; do
-        source_remote $1/$script
-    done
-    rm -rf $confluentscripttmpdir
-    unset confluentscripttmpdir
-}
-
-run_remote_parts() {
-    confluentscripttmpdir=$(mktemp -d /tmp/confluentscripts.XXXXXXXXX)
-    apiclient=/opt/confluent/bin/apiclient
-    if [ -f /etc/confluent/apiclient ]; then
-        apiclient=/etc/confluent/apiclient
-    fi
-    scriptlist=$(confluentpython $apiclient /confluent-api/self/scriptlist/$1|sed -e 's/^- //')
-    for script in $scriptlist; do
-        run_remote $1/$script
-    done
-    rm -rf $confluentscripttmpdir
-    unset confluentscripttmpdir
-}
-
-source_remote() {
-    set_confluent_vars
-    unsettmpdir=0
-    echo
-    echo '---------------------------------------------------------------------------'
-    echo Sourcing $1 from https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/
-    if [ -z "$confluentscripttmpdir" ]; then
-        confluentscripttmpdir=$(mktemp -d /tmp/confluentscripts.XXXXXXXXX)
-        unsettmpdir=1
-    fi
-    echo Sourcing from $confluentscripttmpdir
-    cd $confluentscripttmpdir
-    fetch_remote $1
-    if [ $? != 0 ]; then echo $1 failed to download; return 1; fi
-    chmod +x $1
-    cmd=$1
-    shift
-    source ./$cmd
-    cd - > /dev/null
-    if [ "$unsettmpdir" = 1 ]; then
-        rm -rf $confluentscripttmpdir
-        unset confluentscripttmpdir
-        unsettmpdir=0
-    fi
-    rm -rf $confluentscripttmpdir
-    return $retcode
-}
-
-run_remote() {
-    requestedcmd="'$*'"
-    unsettmpdir=0
-    set_confluent_vars
-    echo
-    echo '---------------------------------------------------------------------------'
-    echo Running $requestedcmd from https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/
-    if [ -z "$confluentscripttmpdir" ]; then
-        confluentscripttmpdir=$(mktemp -d /tmp/confluentscripts.XXXXXXXXX)
-        unsettmpdir=1
-    fi
-    echo Executing in $confluentscripttmpdir
-    cd $confluentscripttmpdir
-    fetch_remote $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=$?
-    if [ $retcode -ne 0 ]; then
-        echo "$requestedcmd exited with code $retcode"
-    fi
-    cd - > /dev/null
-    if [ "$unsettmpdir" = 1 ]; then
-        rm -rf $confluentscripttmpdir
-        unset confluentscripttmpdir
-        unsettmpdir=0
-    fi
-    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://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/
-    confluentscripttmpdir=$(mktemp -d /tmp/confluentscripts.XXXXXXXXX)
-    echo Executing in $confluentscripttmpdir
-    cd $confluentscripttmpdir
-    mkdir -p $(dirname $1)
-    whost=$confluent_mgr
-    if [[ "$whost" == *:* ]]; then
-        whost="[$whost]"
-    fi
-    curl -f -sS $curlargs https://$whost/confluent-public/os/$confluent_profile/scripts/$1 > $1
-    if [ $? != 0 ]; then echo "'$*'" failed to download; return 1; fi
-    confluentpython $*
-    retcode=$?
-    echo "'$*' exited with code $retcode"
-    cd - > /dev/null
-    rm -rf $confluentscripttmpdir
-    unset confluentscripttmpdir
-    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 $confluent_mgr under profile $confluent_profile
-    confluentpython $apiclient /confluent-api/self/remoteconfig/"$*" -d {}
-    confluentpython $apiclient /confluent-api/self/remoteconfig/status -w 204
-    echo
-    echo 'Completed remote configuration'
-    echo '---------------------------------------------------------------------------'
-    return
-}
-#If invoked as a command, use the arguments to actually run a function
-(return 0 2>/dev/null) || $1 "${@:2}"

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

@@ -1,93 +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")
-        if os.path.exists('/sys/block/{0}/size'.format(self.name)):
-            with open('/sys/block/{0}/size'.format(self.name), 'r') as sizesrc:
-                self.size = int(sizesrc.read()) * 512
-        if int(self.size) < 536870912:
-            raise Exception("Device too small for install")
-
-    @property
-    def priority(self):
-        if self.model.lower() in ('m.2 nvme 2-bay raid kit', 'thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
-            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()

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

@@ -1,376 +0,0 @@
-#!/usr/bin/python3
-import glob
-import json
-import os
-import re
-import time
-import shutil
-import socket
-import stat
-import struct
-import sys
-import subprocess
-
-def get_next_part_meta(img, imgsize):
-    if img.tell() == imgsize:
-        return None
-    pathlen = struct.unpack('!H', img.read(2))[0]
-    mountpoint = img.read(pathlen).decode('utf8')
-    jsonlen = struct.unpack('!I', img.read(4))[0]
-    metadata = json.loads(img.read(jsonlen).decode('utf8'))
-    img.seek(16, 1) # skip the two 64-bit values we don't use, they are in json
-    nextlen = struct.unpack('!H', img.read(2))[0]
-    img.seek(nextlen, 1) # skip filesystem type
-    nextlen = struct.unpack('!H', img.read(2))[0]
-    img.seek(nextlen, 1) # skip orig devname (redundant with json)
-    nextlen = struct.unpack('!H', img.read(2))[0]
-    img.seek(nextlen, 1) # skip padding
-    nextlen = struct.unpack('!Q', img.read(8))[0]
-    img.seek(nextlen, 1)  # go to next section
-    return metadata
-
-def get_multipart_image_meta(img):
-    img.seek(0, 2)
-    imgsize = img.tell()
-    img.seek(16)
-    seekamt = img.read(1)
-    img.seek(struct.unpack('B', seekamt)[0], 1)
-    partinfo = get_next_part_meta(img, imgsize)
-    while partinfo:
-        yield partinfo
-        partinfo = get_next_part_meta(img, imgsize)
-
-def get_image_metadata(imgpath):
-    with open(imgpath, 'rb') as img:
-        header = img.read(16)
-        if header == b'\x63\x7b\x9d\x26\xb7\xfd\x48\x30\x89\xf9\x11\xcf\x18\xfd\xff\xa1':
-            for md in get_multipart_image_meta(img):
-                yield md
-        else:
-            raise Exception('Installation from single part image not supported')
-
-class PartedRunner():
-    def __init__(self, disk):
-        self.disk = disk
-
-    def run(self, command):
-        command = command.split()
-        command = ['parted', '-a', 'optimal', '-s', self.disk] + command
-        return subprocess.check_output(command).decode('utf8')
-
-def fixup(rootdir, vols):
-    devbymount = {}
-    for vol in vols:
-        devbymount[vol['mount']] = vol['targetdisk']
-    fstabfile = os.path.join(rootdir, 'etc/fstab')
-    with open(fstabfile) as tfile:
-        fstab = tfile.read().split('\n')
-    while not fstab[0]:
-        fstab = fstab[1:]
-    if os.path.exists(os.path.join(rootdir, '.autorelabel')):
-        os.unlink(os.path.join(rootdir, '.autorelabel'))
-    with open(fstabfile, 'w') as tfile:
-        for tab in fstab:
-            entry = tab.split()
-            if tab.startswith('#ORIGFSTAB#'):
-                if entry[1] in devbymount:
-                    targetdev = devbymount[entry[1]]
-                    if targetdev.startswith('/dev/localstorage/'):
-                        entry[0] = targetdev
-                    else:
-                        uuid = subprocess.check_output(['blkid', '-s', 'UUID', '-o', 'value', targetdev]).decode('utf8')
-                        uuid = uuid.strip()
-                        entry[0] = 'UUID={}'.format(uuid)
-                elif entry[2] == 'swap':
-                    entry[0] = '/dev/mapper/localstorage-swap'
-                entry[0] = entry[0].ljust(42)
-                entry[1] = entry[1].ljust(16)
-                entry[3] = entry[3].ljust(28)
-                tab = '\t'.join(entry)
-            tfile.write(tab + '\n')
-    with open(os.path.join(rootdir, 'etc/hostname'), 'w') as nameout:
-        nameout.write(socket.gethostname() + '\n')
-    selinuxconfig = os.path.join(rootdir, 'etc/selinux/config')
-    policy = None
-    if os.path.exists(selinuxconfig):
-        with open(selinuxconfig) as cfgin:
-            sec = cfgin.read().split('\n')
-            for l in sec:
-                l = l.split('#', 1)[0]
-                if l.startswith('SELINUXTYPE='):
-                    _, policy = l.split('=')
-    for sshkey in glob.glob(os.path.join(rootdir, 'etc/ssh/*_key*')):
-        os.unlink(sshkey)
-    for sshkey in glob.glob('/etc/ssh/*_key*'):
-        newkey = os.path.join(rootdir, sshkey[1:])
-        shutil.copy2(sshkey, newkey)
-        finfo = os.stat(sshkey)
-        os.chown(newkey, finfo[stat.ST_UID], finfo[stat.ST_GID])
-    for ifcfg in glob.glob(os.path.join(rootdir, 'etc/sysconfig/network-scripts/*')):
-        os.unlink(ifcfg)
-    for ifcfg in glob.glob(os.path.join(rootdir, 'etc/NetworkManager/system-connections/*')):
-        os.unlink(ifcfg)
-    for ifcfg in glob.glob('/run/NetworkManager/system-connections/*'):
-        newcfg = ifcfg.split('/')[-1]
-        newcfg = os.path.join(rootdir, 'etc/NetworkManager/system-connections/{0}'.format(newcfg))
-        shutil.copy2(ifcfg, newcfg)
-    shutil.rmtree(os.path.join(rootdir, 'etc/confluent/'))
-    shutil.copytree('/etc/confluent', os.path.join(rootdir, 'etc/confluent'))
-    if policy:
-        sys.stdout.write('Applying SELinux labeling...')
-        sys.stdout.flush()
-        subprocess.check_call(['setfiles', '-r', rootdir, os.path.join(rootdir, 'etc/selinux/{}/contexts/files/file_contexts'.format(policy)), os.path.join(rootdir, 'etc')])
-        subprocess.check_call(['setfiles', '-r', rootdir, os.path.join(rootdir, 'etc/selinux/{}/contexts/files/file_contexts'.format(policy)), os.path.join(rootdir, 'opt')])
-        sys.stdout.write('Done\n')
-        sys.stdout.flush()
-    for metafs in ('proc', 'sys', 'dev'):
-        subprocess.check_call(['mount', '-o', 'bind', '/{}'.format(metafs), os.path.join(rootdir, metafs)])
-    with open(os.path.join(rootdir, 'etc/sysconfig/grub')) as defgrubin:
-        defgrub = defgrubin.read().split('\n')
-    with open(os.path.join(rootdir, 'etc/sysconfig/grub'), 'w') as defgrubout:
-        for gline in defgrub:
-            gline = gline.split()
-            newline = []
-            for ent in gline:
-                if ent.startswith('resume=') or ent.startswith('rd.lvm.lv'):
-                    continue
-                newline.append(ent)
-            defgrubout.write(' '.join(newline) + '\n')
-    grubcfg = subprocess.check_output(['find', os.path.join(rootdir, 'boot'), '-name', 'grub.cfg']).decode('utf8').strip().replace(rootdir, '/')
-    subprocess.check_call(['chroot', rootdir, 'grub2-mkconfig', '-o', grubcfg])
-    newroot = None
-    with open('/etc/shadow') as shadowin:
-        shents = shadowin.read().split('\n')
-        for shent in shents:
-            shent = shent.split(':')
-            if not shent:
-                continue
-            if shent[0] == 'root' and shent[1] not in ('*', '!!', ''):
-                newroot = shent[1]
-    if newroot:
-        shlines = None
-        with open(os.path.join(rootdir, 'etc/shadow')) as oshadow:
-            shlines = oshadow.read().split('\n')
-        with open(os.path.join(rootdir, 'etc/shadow'), 'w') as oshadow:
-            for line in shlines:
-                if line.startswith('root:'):
-                    line = line.split(':')
-                    line[1] = newroot
-                    line = ':'.join(line)
-                oshadow.write(line + '\n')
-    partnum = None
-    targblock = None
-    for vol in vols:
-        if vol['mount'] == '/boot/efi':
-            targdev = vol['targetdisk']
-            partnum = re.search('(\d+)$', targdev).group(1)
-            targblock = re.search('(.*)\d+$', targdev).group(1)
-    if targblock:
-        shimpath = subprocess.check_output(['find', os.path.join(rootdir, 'boot/efi'), '-name', 'shimx64.efi']).decode('utf8').strip()
-        shimpath = shimpath.replace(rootdir, '/').replace('/boot/efi', '').replace('//', '/').replace('/', '\\')
-        subprocess.check_call(['efibootmgr', '-c', '-d', targblock, '-l', shimpath, '--part', partnum])
-    #other network interfaces
-
-
-def had_swap():
-    with open('/etc/fstab') as tabfile:
-        tabs = tabfile.read().split('\n')
-        for tab in tabs:
-            tab = tab.split()
-            if len(tab) < 3:
-                continue
-            if tab[2] == 'swap':
-                return True
-    return False
-
-def install_to_disk(imgpath):
-    lvmvols = {}
-    deftotsize = 0
-    mintotsize = 0
-    deflvmsize = 0
-    minlvmsize = 0
-    biggestsize = 0
-    biggestfs = None
-    plainvols = {}
-    allvols = []
-    swapsize = 0
-    if had_swap():
-        with open('/proc/meminfo') as meminfo:
-            swapsize = meminfo.read().split('\n')[0]
-        swapsize = int(swapsize.split()[1])
-        if swapsize < 2097152:
-            swapsize = swapsize * 2
-        elif swapsize > 8388608 and swapsize < 67108864:
-            swapsize = swapsize * 0.5
-        elif swapsize >= 67108864:
-            swapsize = 33554432
-        swapsize = int(swapsize * 1024)
-    deftotsize = swapsize
-    mintotsize = swapsize
-    for fs in get_image_metadata(imgpath):
-        allvols.append(fs)
-        deftotsize += fs['initsize']
-        mintotsize += fs['minsize']
-        if fs['initsize'] > biggestsize:
-            biggestfs = fs
-            biggestsize = fs['initsize']
-        if fs['device'].startswith('/dev/mapper'):
-            lvmvols[fs['device'].replace('/dev/mapper/', '')] = fs
-            deflvmsize += fs['initsize']
-            minlvmsize += fs['minsize']
-        else:
-            plainvols[int(re.search('(\d+)$', fs['device'])[0])] = fs
-    with open('/tmp/installdisk') as diskin:
-        instdisk = diskin.read()
-    instdisk = '/dev/' + instdisk
-    parted = PartedRunner(instdisk)
-    dinfo = parted.run('unit s print')
-    dinfo = dinfo.split('\n')
-    sectors = 0
-    sectorsize = 0
-    for inf in dinfo:
-        if inf.startswith('Disk {0}:'.format(instdisk)):
-            _, sectors = inf.split(': ')
-            sectors = int(sectors.replace('s', ''))
-        if inf.startswith('Sector size (logical/physical):'):
-            _, sectorsize = inf.split(':')
-            sectorsize = sectorsize.split('/')[0]
-            sectorsize = sectorsize.replace('B', '')
-            sectorsize = int(sectorsize)
-    # for now, only support resizing/growing the largest partition
-    minexcsize = deftotsize - biggestfs['initsize']
-    mintotsize = deftotsize - biggestfs['initsize'] + biggestfs['minsize']
-    minsectors = mintotsize // sectorsize
-    if sectors < (minsectors + 65536):
-        raise Exception('Disk too small to fit image')
-    biggestsectors = sectors - (minexcsize // sectorsize)
-    biggestsize = sectorsize * biggestsectors
-    parted.run('mklabel gpt')
-    curroffset = 2048
-    for volidx in sorted(plainvols):
-        vol = plainvols[volidx]
-        if vol is not biggestfs:
-            size = vol['initsize'] // sectorsize
-        else:
-            size = biggestsize // sectorsize
-        size += 2047 - (size % 2048)
-        end = curroffset + size
-        if end > sectors:
-            end = sectors
-        parted.run('mkpart primary {}s {}s'.format(curroffset, end))
-        vol['targetdisk'] = instdisk + '{0}'.format(volidx)
-        curroffset += size + 1
-    if not lvmvols:
-        if swapsize:
-            swapsize = swapsize // sectorsize
-            swapsize += 2047 - (size % 2048)
-            end = curroffset + swapsize
-            if end > sectors:
-                end = sectors
-            parted.run('mkpart swap {}s {}s'.format(curroffset, end))
-            subprocess.check_call(['mkswap', instdisk + '{}'.format(volidx + 1)])
-    else:
-        parted.run('mkpart lvm {}s 100%'.format(curroffset))
-        lvmpart = instdisk + '{}'.format(volidx + 1)
-        subprocess.check_call(['pvcreate', '-ff', '-y', lvmpart])
-        subprocess.check_call(['vgcreate', 'localstorage', lvmpart])
-        vginfo = subprocess.check_output(['vgdisplay', 'localstorage', '--units', 'b']).decode('utf8')
-        vginfo = vginfo.split('\n')
-        pesize = 0
-        pes = 0
-        for infline in vginfo:
-            infline = infline.split()
-            if len(infline) >= 3 and infline[:2] == ['PE', 'Size']:
-                pesize = int(infline[2])
-            if len(infline) >= 5 and infline[:2] == ['Free', 'PE']:
-                pes = int(infline[4])
-        takeaway = swapsize // pesize
-        for volidx in lvmvols:
-            vol = lvmvols[volidx]
-            if vol is biggestfs:
-                continue
-            takeaway += vol['initsize'] // pesize
-            takeaway += 1
-        biggestextents = pes - takeaway
-        for volidx in lvmvols:
-            vol = lvmvols[volidx]
-            if vol is biggestfs:
-                extents = biggestextents
-            else:
-                extents = vol['initsize'] // pesize
-                extents += 1
-            if vol['mount'] == '/':
-                lvname = 'root'
-            else:
-                lvname = vol['mount'].replace('/', '_')
-            subprocess.check_call(['lvcreate', '-l', '{}'.format(extents), '-y', '-n', lvname, 'localstorage'])
-            vol['targetdisk'] = '/dev/localstorage/{}'.format(lvname)
-        if swapsize:
-            subprocess.check_call(['lvcreate', '-y', '-l', '{}'.format(swapsize // pesize), '-n', 'swap', 'localstorage'])
-            subprocess.check_call(['mkswap', '/dev/localstorage/swap'])
-        os.makedirs('/run/imginst/targ')
-        for vol in allvols:
-            with open(vol['targetdisk'], 'wb') as partition:
-                partition.write(b'\x00' * 1 * 1024 * 1024)
-            subprocess.check_call(['mkfs.{}'.format(vol['filesystem']), vol['targetdisk']])
-            subprocess.check_call(['mount', vol['targetdisk'], '/run/imginst/targ'])
-            source = vol['mount'].replace('/', '_')
-            source = '/run/imginst/sources/' + source
-            blankfsstat = os.statvfs('/run/imginst/targ')
-            blankused = (blankfsstat.f_blocks - blankfsstat.f_bfree) * blankfsstat.f_bsize
-            sys.stdout.write('\nWriting {0}: '.format(vol['mount']))
-            with subprocess.Popen(['cp', '-ax', source + '/.', '/run/imginst/targ']) as copier:
-                stillrunning = copier.poll()
-                lastprogress = 0.0
-                while stillrunning is None:
-                    currfsstat = os.statvfs('/run/imginst/targ')
-                    currused = (currfsstat.f_blocks - currfsstat.f_bfree) * currfsstat.f_bsize
-                    currused -= blankused
-                    with open('/proc/meminfo') as meminf:
-                        for line in meminf.read().split('\n'):
-                            if line.startswith('Dirty:'):
-                                _, dirty, _ = line.split()
-                                dirty = int(dirty) * 1024
-                    progress = (currused - dirty) / vol['minsize']
-                    if progress < lastprogress:
-                        progress = lastprogress
-                    if progress > 0.99:
-                        progress = 0.99
-                    lastprogress = progress
-                    progress = progress * 100
-                    sys.stdout.write('\x1b[1K\rWriting {0}: {1:3.2f}%'.format(vol['mount'], progress))
-                    sys.stdout.flush()
-                    time.sleep(0.5)
-                    stillrunning = copier.poll()
-                if stillrunning != 0:
-                    raise Exception("Error copying volume")
-                with subprocess.Popen(['sync']) as syncrun:
-                    stillrunning = syncrun.poll()
-                    while stillrunning is None:
-                        with open('/proc/meminfo') as meminf:
-                            for line in meminf.read().split('\n'):
-                                if line.startswith('Dirty:'):
-                                    _, dirty, _ = line.split()
-                                    dirty = int(dirty) * 1024
-                        progress = (vol['minsize'] - dirty) / vol['minsize']
-                        if progress < lastprogress:
-                            progress = lastprogress
-                        if progress > 0.99:
-                            progress = 0.99
-                        lastprogress = progress
-                        progress = progress * 100
-                        sys.stdout.write('\x1b[1K\rWriting {0}: {1:3.2f}%'.format(vol['mount'], progress))
-                        sys.stdout.flush()
-                        time.sleep(0.5)
-                        stillrunning = syncrun.poll()
-                sys.stdout.write('\x1b[1K\rDone writing {0}'.format(vol['mount']))
-                sys.stdout.write('\n')
-                sys.stdout.flush()
-            subprocess.check_call(['umount', '/run/imginst/targ'])
-        for vol in allvols:
-            subprocess.check_call(['mount', vol['targetdisk'], '/run/imginst/targ/' + vol['mount']])
-        fixup('/run/imginst/targ', allvols)
-
-
-if __name__ == '__main__':
-    install_to_disk(os.environ['mountsrc'])

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

@@ -1,131 +0,0 @@
-. /lib/dracut-lib.sh
-confluent_whost=$confluent_mgr
-if [[ "$confluent_whost" == *:* ]]; then
-    confluent_whost="[$confluent_mgr]"
-fi
-mkdir -p /mnt/remoteimg /mnt/remote /mnt/overlay
-if [ "untethered" = "$(getarg confluent_imagemethod)" ]; then
-    mount -t tmpfs untethered /mnt/remoteimg
-    curl https://$confluent_whost/confluent-public/os/$confluent_profile/rootimg.sfs -o /mnt/remoteimg/rootimg.sfs
-else
-    confluent_urls="$confluent_urls https://$confluent_whost/confluent-public/os/$confluent_profile/rootimg.sfs"
-    /opt/confluent/bin/urlmount $confluent_urls /mnt/remoteimg
-fi
-/opt/confluent/bin/confluent_imginfo /mnt/remoteimg/rootimg.sfs > /tmp/rootimg.info
-loopdev=$(losetup -f)
-export mountsrc=$loopdev
-losetup -r $loopdev /mnt/remoteimg/rootimg.sfs
-if grep '^Format: confluent_crypted' /tmp/rootimg.info > /dev/null; then
-    while ! curl -sf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" https://$confluent_whost/confluent-api/self/profileprivate/pending/rootimg.key > /tmp/rootimg.key; do
-        echo "Unable to retrieve private key from $confluent_mgr (verify that confluent can access /var/lib/confluent/private/os/$confluent_profile/pending/rootimg.key)"
-        sleep 1
-    done
-    cipher=$(head -n 1 /tmp/rootimg.key)
-    key=$(tail -n 1 /tmp/rootimg.key)
-    len=$(wc -c /mnt/remoteimg/rootimg.sfs | awk '{print $1}')
-    len=$(((len-4096)/512))
-    dmsetup create cryptimg --table "0 $len crypt $cipher $key 0 $loopdev 8"
-    /opt/confluent/bin/confluent_imginfo /dev/mapper/cryptimg > /tmp/rootimg.info
-    mountsrc=/dev/mapper/cryptimg
-fi
-
-if grep '^Format: squashfs' /tmp/rootimg.info > /dev/null; then
-    mount -o ro $mountsrc /mnt/remote
-elif grep  '^Format: confluent_multisquash' /tmp/rootimg.info; then
-    tail -n +3 /tmp/rootimg.info  | awk '{gsub("/", "_"); print "echo 0 " $4 " linear '$mountsrc' " $3 " | dmsetup create mproot" $7}' > /tmp/setupmount.sh
-    . /tmp/setupmount.sh
-    cat /tmp/setupmount.sh |awk '{printf "mount /dev/mapper/"$NF" "; sub("mproot", ""); gsub("_", "/"); print "/mnt/remote"$NF}' > /tmp/mountparts.sh
-    . /tmp/mountparts.sh
-fi
-
-
-#mount -t tmpfs overlay /mnt/overlay
-modprobe zram
-memtot=$(grep ^MemTotal: /proc/meminfo|awk '{print $2}')
-memtot=$((memtot/2))$(grep ^MemTotal: /proc/meminfo | awk '{print $3'})
-echo $memtot > /sys/block/zram0/disksize
-mkfs.xfs /dev/zram0 > /dev/null
-mount -o discard /dev/zram0 /mnt/overlay
-if [ ! -f /tmp/mountparts.sh ]; then
-    mkdir -p /mnt/overlay/upper /mnt/overlay/work
-    mount -t overlay -o upperdir=/mnt/overlay/upper,workdir=/mnt/overlay/work,lowerdir=/mnt/remote disklessroot /sysroot
-else
-    for srcmount in $(cat /tmp/mountparts.sh | awk '{print $3}'); do
-        mkdir -p /mnt/overlay${srcmount}/upper /mnt/overlay${srcmount}/work
-        mount -t overlay -o upperdir=/mnt/overlay${srcmount}/upper,workdir=/mnt/overlay${srcmount}/work,lowerdir=${srcmount} disklesspart /sysroot${srcmount#/mnt/remote}
-    done
-fi
-mkdir -p /sysroot/etc/ssh
-mkdir -p /sysroot/etc/confluent
-mkdir -p /sysroot/root/.ssh
-cp /root/.ssh/* /sysroot/root/.ssh
-chmod 700 /sysroot/root/.ssh
-cp /etc/confluent/* /sysroot/etc/confluent/
-cp /etc/ssh/*key* /sysroot/etc/ssh/
-for pubkey in /etc/ssh/ssh_host*key.pub; do
-    certfile=${pubkey/.pub/-cert.pub}
-    privfile=${pubkey%.pub}
-    if [ -s $certfile ]; then
-        echo HostCertificate $certfile >> /sysroot/etc/ssh/sshd_config
-    fi
-    echo HostKey $privfile >> /sysroot/etc/ssh/sshd_config
-done
-
-mkdir -p /sysroot/dev /sysroot/sys /sysroot/proc /sysroot/run
-if [ ! -z "$autocons" ]; then
-    autocons=${autocons%,*}
-    mkdir -p /run/systemd/generator/getty.target.wants
-    ln -s /usr/lib/systemd/system/serial-getty@.service /run/systemd/generator/getty.target.wants/serial-getty@${autocons}.service
-fi
-while [ ! -e /sysroot/sbin/init ]; do
-    echo "Failed to access root filesystem or it is missing /sbin/init"
-    echo "System should be accessible through ssh at port 2222 with the appropriate key"
-    while [ ! -e /sysroot/sbin/init ]; do
-        sleep 1
-    done
-done
-rootpassword=$(grep ^rootpassword: /etc/confluent/confluent.deploycfg)
-rootpassword=${rootpassword#rootpassword: }
-if [ "$rootpassword" = "null" ]; then
-    rootpassword=""
-fi
-
-if [ ! -z "$rootpassword" ]; then
-    sed -i "s@root:[^:]*:@root:$rootpassword:@" /sysroot/etc/shadow
-fi
-for i in /ssh/*.ca; do
-    echo '@cert-authority *' $(cat $i) >> /sysroot/etc/ssh/ssh_known_hosts
-done
-echo HostbasedAuthentication yes >> /sysroot/etc/ssh/sshd_config
-echo HostbasedUsesNameFromPacketOnly yes >> /sysroot/etc/ssh/sshd_config
-echo IgnoreRhosts no >> /sysroot/etc/ssh/sshd_config
-sshconf=/sysroot/etc/ssh/ssh_config
-if [ -d /sysroot/etc/ssh/ssh_config.d/ ]; then
-    sshconf=/sysroot/etc/ssh/ssh_config.d/01-confluent.conf
-fi
-echo 'Host *' >> $sshconf
-echo '    HostbasedAuthentication yes' >> $sshconf
-echo '    EnableSSHKeysign yes' >> $sshconf
-echo '    HostbasedKeyTypes *ed25519*' >> $sshconf
-curl -sf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $(cat /etc/confluent/confluent.apikey)" https://$confluent_whost/confluent-api/self/nodelist > /sysroot/etc/ssh/shosts.equiv
-cp /sysroot/etc/ssh/shosts.equiv /sysroot/root/.shosts
-chmod 640 /sysroot/etc/ssh/*_key
-chroot /sysroot chgrp ssh_keys /etc/ssh/*_key
-cp /tls/*.pem /sysroot/etc/pki/ca-trust/source/anchors/
-chroot /sysroot/ update-ca-trust
-curl -sf https://$confluent_whost/confluent-public/os/$confluent_profile/scripts/onboot.service > /sysroot/etc/systemd/system/onboot.service
-mkdir -p /sysroot/opt/confluent/bin
-curl -sf https://$confluent_whost/confluent-public/os/$confluent_profile/scripts/onboot.sh > /sysroot/opt/confluent/bin/onboot.sh
-chmod +x /sysroot/opt/confluent/bin/onboot.sh
-cp /opt/confluent/bin/apiclient /sysroot/opt/confluent/bin
-ln -s /etc/systemd/system/onboot.service /sysroot/etc/systemd/system/multi-user.target.wants/onboot.service
-cp /etc/confluent/functions /sysroot/etc/confluent/functions
-if grep installtodisk /proc/cmdline > /dev/null; then
-    . /etc/confluent/functions
-    run_remote installimage
-    exec reboot -f
-fi
-mv /lib/modules/$(uname -r) /lib/modules/$(uname -r)-ramfs
-ln -s /sysroot/lib/modules/$(uname -r) /lib/modules/
-kill $(grep -l ^/usr/lib/systemd/systemd-udevd  /proc/*/cmdline|cut -d/ -f 3)
-exec /opt/confluent/bin/start_root

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

@@ -1,43 +0,0 @@
-#!/bin/bash
-. /etc/confluent/functions
-# the image will be used to deploy itself
-# provide both access to image (for parsing metadata)
-# and existing mounts of image (to take advantage of caching)
-mount -o bind /sys /sysroot/sys
-mount -o bind /dev /sysroot/dev
-mount -o bind /proc /sysroot/proc
-mount -o bind /run /sysroot/run
-
-
-if [ ! -f /tmp/mountparts.sh ]; then
-    mkdir -p /sysroot/run/imginst/sources/_
-    mount -o bind /mnt/remote /sysroot/run/imginst/sources/_
-else
-    for srcmount in $(cat /tmp/mountparts.sh | awk '{print $2}'); do
-        srcname=${srcmount#/dev/mapper/mproot}
-        srcdir=$(echo $srcmount | sed -e 's!/dev/mapper/mproot!/mnt/remote!' -e 's!_!/!g')
-        mkdir -p /sysroot/run/imginst/sources/$srcname
-        mount -o bind $srcdir /sysroot/run/imginst/sources/$srcname
-    done
-fi
-cd /sysroot/run
-chroot /sysroot/ bash -c "source /etc/confluent/functions; run_remote_python getinstalldisk"
-chroot /sysroot/ bash -c "source /etc/confluent/functions; run_remote_parts pre.d"
-if [ ! -f /sysroot/tmp/installdisk ]; then
-    echo 'Unable to find a suitable installation target device, ssh to port 2222 to investigate'
-    while [ ! -f /sysroot/tmp/installdisk ]; do
-        sleep 1
-    done
-fi
-lvm vgchange -a n
-udevadm control -e
-chroot /sysroot /usr/lib/systemd/systemd-udevd --daemon
-chroot /sysroot bash -c "source /etc/confluent/functions; run_remote_python image2disk.py"
-echo "Port 22" >> /etc/ssh/sshd_config
-echo 'Match LocalPort 22' >> /etc/ssh/sshd_config
-echo '    ChrootDirectory /sysroot/run/imginst/targ' >> /etc/ssh/sshd_config
-kill -HUP $(cat /run/sshd.pid)
-
-chroot /sysroot/run/imginst/targ bash -c "source /etc/confluent/functions; run_remote post.sh"
-chroot /sysroot bash -c "umount \$(tac /proc/mounts|awk '{print \$2}'|grep ^/run/imginst/targ)"
-

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

@@ -1,11 +0,0 @@
-[Unit]
-Description=Confluent onboot hook
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-ExecStart=/opt/confluent/bin/onboot.sh
-
-[Install]
-WantedBy=multi-user.target
-

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

@@ -1,43 +0,0 @@
-#!/bin/sh
-
-# This script is executed on each boot as it is
-# 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}')
-confluent_apikey=$(cat /etc/confluent/confluent.apikey)
-v4meth=$(grep ^ipv4_method: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-if [ "$v4meth" = "null" -o -z "$v4meth" ]; then
-    confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-fi
-if [ -z "$confluent_mgr" ]; then
-    confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-fi
-confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-timedatectl set-timezone $(grep ^timezone: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-export nodename confluent_mgr confluent_profile
-. /etc/confluent/functions
-mkdir -p /var/log/confluent
-chmod 700 /var/log/confluent
-exec >> /var/log/confluent/confluent-onboot.log
-exec 2>> /var/log/confluent/confluent-onboot.log
-chmod 600 /var/log/confluent/confluent-onboot.log
-tail -f /var/log/confluent/confluent-onboot.log > /dev/console &
-logshowpid=$!
-
-rpm --import /etc/pki/rpm-gpg/*
-
-run_remote_python add_local_repositories
-run_remote_python syncfileclient
-run_remote_python confignet
-
-run_remote onboot.custom
-# onboot scripts may be placed into onboot.d, e.g. onboot.d/01-firstaction.sh, onboot.d/02-secondaction.sh
-run_remote_parts onboot.d
-
-# Induce execution of remote configuration, e.g. ansible plays in ansible/onboot.d/
-run_remote_config onboot.d
-
-#curl -X POST -d 'status: booted' -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" https://$confluent_mgr/confluent-api/self/updatestatus
-kill $logshowpid

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

@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# This script is executed 'chrooted' into a cloned disk target before rebooting
-#
-
-nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
-confluent_apikey=$(cat /etc/confluent/confluent.apikey)
-confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|awk '{print $2}')
-export nodename confluent_mgr confluent_profile
-. /etc/confluent/functions
-mkdir -p /var/log/confluent
-chmod 700 /var/log/confluent
-exec >> /var/log/confluent/confluent-post.log
-exec 2>> /var/log/confluent/confluent-post.log
-chmod 600 /var/log/confluent/confluent-post.log
-tail -f /var/log/confluent/confluent-post.log > /dev/console &
-logshowpid=$!
-curl -f https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/firstboot.service > /etc/systemd/system/firstboot.service
-mkdir -p /opt/confluent/bin
-curl -f https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/firstboot.sh > /opt/confluent/bin/firstboot.sh
-chmod +x /opt/confluent/bin/firstboot.sh
-systemctl enable firstboot
-selinuxpolicy=$(grep ^SELINUXTYPE /etc/selinux/config |awk -F= '{print $2}')
-if [ ! -z "$selinuxpolicy" ]; then
-    setfiles /etc/selinux/${selinuxpolicy}/contexts/files/file_contexts /etc/
-fi
-run_remote_python syncfileclient
-run_remote post.custom
-# post scripts may be placed into post.d, e.g. post.d/01-firstaction.sh, post.d/02-secondaction.sh
-run_remote_parts post.d
-
-# Induce execution of remote configuration, e.g. ansible plays in ansible/post.d/
-run_remote_config post.d
-
-curl -sf -X POST -d 'status: staged' -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" https://$confluent_mgr/confluent-api/self/updatestatus
-
-kill $logshowpid
-

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

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

confluent_osdeploy/el9-diskless/profiles/default/syncfiles

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

confluent_osdeploy/esxi7/initramfs/bin/dcuiweasel

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

confluent_osdeploy/esxi7/profiles/hypervisor/scripts/makeksnet

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

confluent_osdeploy/genesis/initramfs/opt/confluent/bin/rungenesis

@@ -43,20 +43,6 @@ mkdir -p /etc/pki/tls/certs
 cat /tls/*.pem > /etc/pki/tls/certs/ca-bundle.crt
 TRIES=0
 touch /etc/confluent/confluent.info
-if [ -e /dev/disk/by-label/CNFLNT_IDNT ]; then
-    mkdir -p /media/ident
-    mount /dev/disk/by-label/CNFLNT_IDNT /media/ident
-    if [ -e /media/ident/genesis_bootstrap.sh ]; then
-        exec sh /media/ident/genesis_bootstrap.sh
-    fi
-fi
-if [ -e /dev/disk/by-label/GENESIS-X86 ]; then
-    mkdir -p /media/genesis
-    mount /dev/disk/by-label/GENESIS-X86 /media/genesis
-    if [ -e /media/genesis/genesis_bootstrap.sh ]; then
-        exec sh /media/genesis/genesis_bootstrap.sh
-    fi
-fi
 cd /sys/class/net
 echo -n "Scanning for network configuration..."
 while ! grep ^EXTMGRINFO: /etc/confluent/confluent.info | awk -F'|' '{print $3}' | grep 1 >& /dev/null && [ "$TRIES" -lt 30 ]; do
@@ -155,23 +141,6 @@ elif [ "$autoconfigmethod" = "static" ]; then
         ip route add default via $v4gw
     fi
 fi
-nameserversec=0
-while read -r entry; do
-    if [ $nameserversec = 1 ]; then
-        if [[ $entry == "-"* ]] && [[ $entry != "- ''" ]]; then
-            echo nameserver ${entry#- } >> /etc/resolv.conf
-            continue
-        fi
-    fi
-    nameserversec=0
-    if [ "${entry%:*}" = "nameservers" ]; then
-        nameserversec=1
-        continue
-    fi
-done < /etc/confluent/confluent.deploycfg
-dnsdomain=$(grep ^dnsdomain: /etc/confluent/confluent.deploycfg)
-dnsdomain=${dnsdomain#dnsdomain: }
-echo search $dnsdomain >> /etc/resolv.conf
 echo -n "Initializing ssh..."
 ssh-keygen -A
 for pubkey in /etc/ssh/ssh_host*key.pub; do

confluent_osdeploy/genesis/profiles/default/scripts/functions

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

confluent_osdeploy/genesis/profiles/default/scripts/syncfileclient

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

confluent_osdeploy/rhvh4/profiles/default/scripts/getinstalldisk

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

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

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

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

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

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

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

confluent_osdeploy/suse15-diskless/profiles/default/syncfiles

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

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

@@ -81,7 +81,6 @@ fi
 
 tz=$(grep timezone: /etc/confluent/confluent.deploycfg | awk '{print $2}')
 echo "<timezone>${tz}</timezone>" > /tmp/timezone
-echo "${tz}" > /tmp/timezone.txt
 autoconfigmethod=$(grep ipv4_method /etc/confluent/confluent.deploycfg)
 autoconfigmethod=${autoconfigmethod#ipv4_method: }
 if [ "$autoconfigmethod" = "dhcp" ]; then
@@ -120,9 +119,6 @@ proto=$(grep ^protocol: /etc/confluent/confluent.deploycfg)
 proto=${proto#protocol: }
 
 append=$(grep ^installedargs: /tmp/profile.yaml | sed -e 's/^installedargs: //' -e 's/#.*//')
-if grep console= /etc/fakecmdline >& /dev/null &&  [[ "$append" != *console=* ]]; then
-	append="$append console=${autocons#*/dev/}"
-fi
 if [ -z "$append" ]; then
     echo "<bootloader/>" > /tmp/bootloader.xml
 else

confluent_osdeploy/suse15/profiles/hpc/autoyast

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

confluent_osdeploy/suse15/profiles/hpc/autoyast.leap

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

confluent_osdeploy/suse15/profiles/hpc/initprofile.sh

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

confluent_osdeploy/suse15/profiles/hpc/scripts/firstboot.sh

@@ -20,8 +20,7 @@ confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg|sed -e 's/
 proto=$(grep ^protocol: /etc/confluent/confluent.deploycfg |awk '{print $2}')
 confluent_apikey=$(cat /etc/confluent/confluent.apikey)
 . /etc/confluent/functions
-GIVUP=$(($(date +%s) + 60))
-while (! ping -c 1 $confluent_mgr >& /dev/null) && [ $(date +%s) -lt $GIVUP ]; do
+while ! ping -c 1 $confluent_mgr >& /dev/null; do
 	sleep 1
 done
 

confluent_osdeploy/suse15/profiles/hpc/scripts/functions

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

confluent_osdeploy/suse15/profiles/hpc/scripts/getinstalldisk

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