Enable more plugins for collective routing

Prevent shell session from playing console output
Allow blanking a value to default a plugin attribute
2026-09-29 00:31:09 +00:00 · 2022-07-13 08:57:54 -04:00 · 2022-06-30 14:16:31 -04:00 · 2022-06-30 14:16:23 -04:00 · 2022-06-30 14:16:15 -04:00 · 2022-06-30 14:15:57 -04:00
151 changed files with 487 additions and 3489 deletions
@@ -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
@@ -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
@@ -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(
@@ -38,26 +38,6 @@ 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()
@@ -71,27 +51,6 @@ if options.log:
        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 = []
@@ -86,10 +86,6 @@ def main(args):
    c = client.Command()
    c.stop_if_noderange_over(args.noderange, args.maxnodes)
    errnodes = set([])
-    for rsp in c.read('/noderange/{0}/nodes/'.format(args.noderange)):
-        if 'error' in rsp:
-            sys.stderr.write(rsp['error'] + '\n')
-            sys.exit(1)
    if not args.clear and args.network and not args.prepareonly:
        rc = c.simple_noderange_command(args.noderange, '/boot/nextdevice', 'network',
                                        bootmode='uefi',
@@ -50,52 +50,19 @@ columnmapping = {
 }
 #TODO: add chassis uuid

-def register_endpoint(options, session, addr):
-    neednewline = False
-    current = 0
-    for rsp in session.update('/discovery/register', {'addresses': addr}):
-        if 'count' in rsp:
-            total = rsp['count']
-        elif total > 1:
-            current += 1
-            sys.stdout.write('\x1b[2K\r{0:.1f}% Scanned'.format(100 * current / total))
-            sys.stdout.flush()
-            neednewline = True
-        if 'created' in rsp:
-            if neednewline:
-                print('')
-                neednewline = False
-            print('Registered: {0}'.format(rsp['created']))
-    if neednewline:
-        print('')

-def subscribe_discovery(options, session, subscribe, targ):
-    keyn = 'subscribe' if subscribe else 'unsubscribe'
-    payload = {keyn: targ}
-    if subscribe:
-        for rsp in session.update('/discovery/subscriptions/{0}'.format(targ), payload):
-            if 'status' in rsp:
-                print(rsp['status'])
-    else:
-        for rsp in session.delete('/discovery/subscriptions/{0}'.format(targ)):
-            if 'status' in rsp:
-                print(rsp['status'])
-    
 def print_disco(options, session, currmac, outhandler, columns):
    procinfo = {}
    for tmpinfo in session.read('/discovery/by-mac/{0}'.format(currmac)):

        procinfo.update(tmpinfo)
    if 'Switch' in columns or 'Port' in columns:
-        if 'switch' in procinfo:
-            procinfo['port'] = procinfo['switchport']
-        else:
-            for tmpinfo in session.read(
-                    '/networking/macs/by-mac/{0}'.format(currmac)):
-                if 'ports' in tmpinfo:
-                    # The api sorts so that the most specific available value
-                    # is last
-                    procinfo.update(tmpinfo['ports'][-1])
+        for tmpinfo in session.read(
+                '/networking/macs/by-mac/{0}'.format(currmac)):
+            if 'ports' in tmpinfo:
+                # The api sorts so that the most specific available value
+                # is last
+                procinfo.update(tmpinfo['ports'][-1])
    record = []
    for col in columns:
        rawcol = columnmapping[col]
@@ -353,7 +320,7 @@ def blocking_scan(session):

 def main():
    parser = optparse.OptionParser(
-        usage='Usage: %prog [list|assign|rescan|clear|subscribe|unsubscribe|register] [options]')
+        usage='Usage: %prog [list|assign|rescan|clear] [options]')
    # -a for 'address' maybe?
    # order by
    # show state (discovered or..
@@ -391,15 +358,9 @@ def main():
    parser.add_option('-o', '--order', dest='order',
                      help='Order output by given field', metavar='ORDER')
    (options, args) = parser.parse_args()
-    if len(args) == 0 or args[0] not in ('list', 'assign', 'reassign', 'rescan', 'clear', 'subscribe', 'unsubscribe', 'register'):
+    if len(args) == 0 or args[0] not in ('list', 'assign', 'reassign', 'rescan', 'clear'):
        parser.print_help()
        sys.exit(1)
-    if args[0] == 'register' and len(args) != 2:
-        sys.stderr.write('Register requires target address or range (e.g. 192.168.2.30, 192.168.2.0/24, or 192.168.2.1-192.168.2.30)\n')
-        sys.exit(1)
-    if 'subscribe' in args[0] and len(args) != 2:
-        sys.stderr.write('subscribe/unsubscribe subcommands require switch name as argument\n')
-        sys.exit(1)
    session = client.Command()
    if args[0] == 'list':
        list_discovery(options, session)
@@ -409,12 +370,6 @@ def main():
        assign_discovery(options, session)
    if args[0] == 'reassign':
        assign_discovery(options, session, False)
-    if args[0] == 'register':
-        register_endpoint(options, session, args[1])
-    if args[0] == 'subscribe':
-        subscribe_discovery(options, session, True, args[1])
-    if args[0] == 'unsubscribe':
-        subscribe_discovery(options, session, False, args[1])
    if args[0] == 'rescan':
        blocking_scan(session)
        print("Rescan complete")
@@ -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

@@ -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([])
@@ -282,19 +282,14 @@ def _replay_to_console(txtfile, binfile):
 def replay_to_console(txtfile):
    if os.path.exists(txtfile + '.cbl'):
        binfile = txtfile + '.cbl'
-    elif '.' not in txtfile:
-        if '/' not in txtfile:
-            txtfile = os.getcwd() + '/' + txtfile
-        sys.stderr.write('Unable to locate cbl file: "{0}"\n'.format(txtfile + '.cbl'))
-        sys.exit(1)
    else:
        fileparts = txtfile.split('.')
        prefix = '.'.join(fileparts[:-1])
        binfile = prefix + '.cbl.' + fileparts[-1]
        if not os.path.exists(binfile):
-            sys.stderr.write('Unable to locate cbl file: "{0}"\n'.format(binfile))
+            sys.stderr.write('Unable to locate cbl file\n')
            sys.exit(1)
    _replay_to_console(txtfile, binfile)

 if __name__ == '__main__':
-    replay_to_console(sys.argv[1])
+    replay_to_console(sys.argv[1])
@@ -12,8 +12,8 @@ Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Prefix: %{_prefix}
 BuildArch: noarch
-Vendor: Lenovo
-Url: http://github.com/lenovo/confluent
+Vendor: Jarrod Johnson <jjohnson2@lenovo.com>
+Url: http://xcat.sf.net/
 Obsoletes: confluent_common

 %description
@@ -24,17 +24,25 @@ a confluent server.
 %setup -n %{name}-%{version} -n %{name}-%{version}

 %build
-%if "%{dist}" == ".el7"
-python2 setup.py build
-%else
+%if "%{dist}" == ".el8"
 python3 setup.py build
+%else
+%if "%{dist}" == ".el9"
+python3 setup.py build
+%else
+python2 setup.py build
+%endif
 %endif

 %install
-%if "%{dist}" == ".el7"
-python2 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-scripts=/opt/confluent/bin --install-purelib=/opt/confluent/lib/python
-%else
+%if "%{dist}" == ".el8"
 python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-scripts=/opt/confluent/bin --install-purelib=/opt/confluent/lib/python
+%else
+%if "%{dist}" == ".el9"
+python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-scripts=/opt/confluent/bin --install-purelib=/opt/confluent/lib/python
+%else
+python2 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-scripts=/opt/confluent/bin --install-purelib=/opt/confluent/lib/python
+%endif
 %endif


@@ -43,6 +51,4 @@ rm -rf $RPM_BUILD_ROOT

 %files -f INSTALLED_FILES
 %license /opt/confluent/share/licenses/confluent_client/LICENSE
-%license /opt/confluent/share/licenses/confluent_client/COPYRIGHT
 %defattr(-,root,root)
-/opt/confluent
@@ -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
@@ -26,26 +26,6 @@ a new session.
  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

@@ -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
@@ -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`
@@ -2,7 +2,7 @@ from setuptools import setup
 import os

 data_files = [('/etc/profile.d', ['confluent_env.sh', 'confluent_env.csh']),
-              ('/opt/confluent/share/licenses/confluent_client/', ['LICENSE', 'COPYRIGHT'])
+              ('/opt/confluent/share/licenses/confluent_client/', ['LICENSE'])
              ]
 try:
    scriptlist = ['bin/{0}'.format(d) for d in os.listdir('bin/')]
@@ -15,14 +15,10 @@ except OSError:
 setup(
    name='confluent_client',
    version='#VERSION#',
-    author='Lenovo',
+    author='Jarrod Johnson',
    author_email='jjohnson2@lenovo.com',
-    url='http://github.com/lenovo/confluent/',
-    license='Apache-2.0',
-    description='Command line client and libraries for confluent management server',
-    long_description='Command line client and libraries for confluent management server',
+    url='http://xcat.sf.net/',
    packages=['confluent'],
-    platforms=['Linux'],
    scripts=scriptlist,
    data_files=data_files,
 )
@@ -159,7 +159,6 @@ def get_net_apikey(nodename, mgr):
            else:
                cliaddr = ('::', 302)
            clisock.bind(cliaddr)
-            clisock.settimeout(1)
            clisock.connect(addrinfo[-1])
            rsp = clisock.recv(8)
            if rsp != b'\xc2\xd1-\xa8\x80\xd8j\xba':
@@ -223,8 +222,7 @@ def get_apikey(nodename, hosts, errout=None):
    return apikey

 class HTTPSClient(client.HTTPConnection, object):
-    def __init__(self, usejson=False, port=443, host=None, errout=None, phmac=None):
-        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 +244,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 +252,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 +269,7 @@ class HTTPSClient(client.HTTPConnection, object):
                for line in info:
                    if line.startswith('deploy_server: ') or line.startswith('deploy_server_v6: '):
                        self.hosts.append(line.split(': ', 1)[1])
-        if 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 +406,6 @@ if __name__ == '__main__':
        errout = sys.argv.pop(errout)
    except ValueError:
        errout = None
-    try:
-        phmac = sys.argv.index('-p')
-        sys.argv.pop(phmac)
-        phmac = sys.argv.pop(phmac)
-    except ValueError:
-        phmac = None
-    try:
-        checkonly = False
-        idxit = sys.argv.index('-c')
-        sys.argv.pop(idxit)
-        checkonly = True
-    except Exception:
-        pass
    if len(sys.argv) > 2 and os.path.exists(sys.argv[-1]):
        data = open(sys.argv[-1]).read()
    if outbin:
@@ -443,13 +417,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())
@@ -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
@@ -73,13 +73,11 @@ mv ../addons.tgz .
 cd ..
 cp -a esxi7out esxi6out
 cp -a esxi7 esxi6
-cp -a esxi7out esxi8out
-cp -a esxi7 esxi8

 %install
 mkdir -p %{buildroot}/opt/confluent/share/licenses/confluent_osdeploy/
 cp LICENSE %{buildroot}/opt/confluent/share/licenses/confluent_osdeploy/
-for os in rhvh4 el7 el8 el9 genesis suse15 ubuntu20.04 ubuntu22.04 esxi6 esxi7 esxi8 coreos; do
+for os in rhvh4 el7 el8 el9 genesis suse15 ubuntu20.04 ubuntu22.04 esxi6 esxi7 coreos; do
    mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/$os/initramfs
    mkdir -p %{buildroot}/opt/confluent/lib/osdeploy/$os/profiles
    cp ${os}out/addons.* %{buildroot}/opt/confluent/lib/osdeploy/$os/initramfs
@@ -20,7 +20,6 @@ if [ -e /dev/disk/by-label/CNFLNT_IDNT ]; then
    else
        v4addr=$(grep ^ipv4_address: $tcfg)
        v4addr=${v4addr#ipv4_address: }
-        v4addr=${v4addr%/*}
        v4gw=$(grep ^ipv4_gateway: $tcfg)
        v4gw=${v4gw#ipv4_gateway: }
        if [ "$v4gw" = "null" ]; then
@@ -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
-
-
-
@@ -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
-
@@ -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
@@ -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=$?
@@ -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
@@ -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)
@@ -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
@@ -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=$?
@@ -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
@@ -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__':
@@ -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
@@ -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
@@ -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=$?
@@ -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
@@ -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
@@ -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
@@ -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 = ''
@@ -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]"
@@ -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]"
@@ -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
@@ -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=$?
@@ -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
@@ -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 = ''
@@ -28,7 +28,7 @@ get_remote_apikey() {
 root=1
 rootok=1
 netroot=confluent
-echo -ne '\033[H\033[2J\033[3J'
+#clear
 mkdir -p /etc/ssh
 mkdir -p /var/tmp/
 mkdir -p /var/empty/sshd
@@ -124,7 +124,7 @@ while [ $ready = "0" ]; do
        confluent_mgr="[$confluent_mgr]"
    fi
    tmperr=$(mktemp)
-    curl -sSf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" https://$confluent_mgr/confluent-api/self/deploycfg2 > /etc/confluent/confluent.deploycfg 2> $tmperr
+    curl -sSf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" https://$confluent_mgr/confluent-api/self/deploycfg > /etc/confluent/confluent.deploycfg 2> $tmperr
    if grep 401 $tmperr > /dev/null; then
        confluent_apikey=""
        if [ -n "$lasthdl" ]; then
@@ -148,36 +148,13 @@ if [ -c /dev/tpmrm0 ]; then
    tpm2_pcrextend 15:sha256=2fbe96c50dde38ce9cd2764ddb79c216cfbcd3499568b1125450e60c45dd19f2
 fi
 umask $oldumask
-mkdir -p /run/NetworkManager/system-connections
-cat > /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-[connection]
-EOC
-echo id=${ifname} >> /run/NetworkManager/system-connections/$ifname.nmconnection
-echo uuid=$(uuidgen) >> /run/NetworkManager/system-connections/$ifname.nmconnection
-cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-type=ethernet
-autoconnect-retries=1
-EOC
-echo interface-name=$ifname >> /run/NetworkManager/system-connections/$ifname.nmconnection
-cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-multi-connect=1
-permissions=
-wait-device-timeout=60000
-
-[ethernet]
-mac-address-blacklist=
-
-EOC
 autoconfigmethod=$(grep ^ipv4_method: /etc/confluent/confluent.deploycfg |awk '{print $2}')
-auto6configmethod=$(grep ^ipv6_method: /etc/confluent/confluent.deploycfg |awk '{print $2}')
 if [ "$autoconfigmethod" = "dhcp" ]; then
    echo -n "Attempting to use dhcp to bring up $ifname..."
    dhclient $ifname
    echo "Complete:"
    ip addr show dev $ifname
-    confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg| awk '{print $2}')
-elif [ "$autoconfigmethod" = "static" ]; then
-    confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg| awk '{print $2}')
+else
    v4addr=$(grep ^ipv4_address: /etc/confluent/confluent.deploycfg)
    v4addr=${v4addr#ipv4_address: }
    v4gw=$(grep ^ipv4_gateway: /etc/confluent/confluent.deploycfg)
@@ -192,7 +169,27 @@ elif [ "$autoconfigmethod" = "static" ]; then
    if [ ! -z "$v4gw" ]; then
        ip route add default via $v4gw
    fi
-    echo '[ipv4]' >> /run/NetworkManager/system-connections/$ifname.nmconnection
+    mkdir -p /run/NetworkManager/system-connections
+    cat > /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
+[connection]
+EOC
+    echo id=${ifname} >> /run/NetworkManager/system-connections/$ifname.nmconnection
+    echo uuid=$(uuidgen) >> /run/NetworkManager/system-connections/$ifname.nmconnection
+    cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
+type=ethernet
+autoconnect-retries=1
+EOC
+    echo interface-name=$ifname >> /run/NetworkManager/system-connections/$ifname.nmconnection
+    cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
+multi-connect=1
+permissions=
+wait-device-timeout=60000
+
+[ethernet]
+mac-address-blacklist=
+
+[ipv4]
+EOC
    echo address1=$v4addr/$v4nm >> /run/NetworkManager/system-connections/$ifname.nmconnection
    if [ ! -z "$v4gw" ]; then
        echo gateway=$v4gw >> /run/NetworkManager/system-connections/$ifname.nmconnection
@@ -201,7 +198,7 @@ elif [ "$autoconfigmethod" = "static" ]; then
    nameservers=""
    while read -r entry; do
        if [ $nameserversec = 1 ]; then
-            if [[ $entry == "-"*.* ]]; then
+            if [[ $entry == "-"* ]]; then
                nameservers="$nameservers"${entry#- }";"
                continue
            fi
@@ -224,69 +221,16 @@ method=manual
 addr-gen-mode=eui64
 method=auto

+[proxy]
 EOC
-elif [ "$auto6configmethod" = "static" ]; then
-    confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg| awk '{print $2}')
-    v6addr=$(grep ^ipv6_address: /etc/confluent/confluent.deploycfg)
-    v6addr=${v6addr#ipv6_address: }
-    v6gw=$(grep ^ipv6_gateway: /etc/confluent/confluent.deploycfg)
-    v6gw=${v6gw#ipv6_gateway: }
-    if [ "$v6gw" = "null" ]; then
-        v6gw=""
-    fi
-    v6nm=$(grep ^ipv6_prefix: /etc/confluent/confluent.deploycfg)
-    v6nm=${v6nm#ipv6_prefix: }
-    echo "Setting up $ifname as static at $v6addr/$v6nm"
-    ip addr add dev $ifname $v6addr/$v6nm
-
-    cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-[ipv4]
-dhcp-timeout=90
-dhcp-vendor-class-identifier=anaconda-Linux
-method=disabled
-
-[ipv6]
-addr-gen-mode=eui64
-method=manual
-may-fail=false
-EOC
-    echo address1=$v6addr/$v6nm >> /run/NetworkManager/system-connections/$ifname.nmconnection
-    if [ ! -z "$v6gw" ]; then
-        ip route add default via $v6gw
-        echo gateway=$v6gw >> /run/NetworkManager/system-connections/$ifname.nmconnection
-    fi
-    nameserversec=0
-    nameservers=""
-    while read -r entry; do
-        if [ $nameserversec = 1 ]; then
-            if [[ $entry == "-"*:* ]]; then
-                nameservers="$nameservers"${entry#- }";"
-                continue
-            fi
-        fi
-        nameserversec=0
-        if [ "${entry%:*}" = "nameservers" ]; then
-            nameserversec=1
-            continue
-        fi
-    done < /etc/confluent/confluent.deploycfg
-    echo dns=$nameservers >> /run/NetworkManager/system-connections/$ifname.nmconnection
-    dnsdomain=$(grep ^dnsdomain: /etc/confluent/confluent.deploycfg)
-    dnsdomain=${dnsdomain#dnsdomain: }
-    echo dns-search=$dnsdomain >> /run/NetworkManager/system-connections/$ifname.nmconnection
 fi
-echo '[proxy]' >> /run/NetworkManager/system-connections/$ifname.nmconnection
 chmod 600 /run/NetworkManager/system-connections/*.nmconnection
-confluent_websrv=$confluent_mgr
-if [[ $confluent_websrv == *:* ]]; then
-    confluent_websrv="[$confluent_websrv]"
-fi
 echo -n "Initializing ssh..."
 ssh-keygen -A
 for pubkey in /etc/ssh/ssh_host*key.pub; do
    certfile=${pubkey/.pub/-cert.pub}
    privfile=${pubkey%.pub}
-    curl -sf -X POST -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" -d @$pubkey  https://$confluent_websrv/confluent-api/self/sshcert > $certfile
+    curl -sf -X POST -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" -d @$pubkey  https://$confluent_mgr/confluent-api/self/sshcert > $certfile
    if [ -s $certfile ]; then
        echo HostCertificate $certfile >> /etc/ssh/sshd_config
    fi
@@ -303,7 +247,8 @@ for addr in $(grep ^MANAGER: /etc/confluent/confluent.info|awk '{print $2}'|sed
        confluent_urls="$confluent_urls $confluent_proto://$addr/confluent-public/os/$confluent_profile/rootimg.sfs"
    fi
 done
+confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg| awk '{print $2}')
 mkdir -p /etc/confluent
-curl -sf https://$confluent_websrv/confluent-public/os/$confluent_profile/scripts/functions > /etc/confluent/functions
+curl -sf https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/functions > /etc/confluent/functions
 . /etc/confluent/functions
 source_remote imageboot.sh
@@ -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
@@ -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=$?
@@ -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
@@ -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
@@ -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
@@ -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 = ''
@@ -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
@@ -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)
+    
@@ -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=$?
@@ -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 = ''
@@ -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
@@ -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=$?
@@ -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
@@ -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()
@@ -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
@@ -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
@@ -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>
@@ -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>
@@ -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
@@ -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

@@ -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=$?
@@ -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
@@ -6,7 +6,6 @@
 exec >> /tmp/confluent-pre.log
 exec 2>> /tmp/confluent-pre.log
 chmod 600 /tmp/confluent-pre.log
-cat /tls/*.pem > /etc/confluent/ca.pem
 nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
 rootpw=$(grep rootpassword: /etc/confluent/confluent.deploycfg|sed -e 's/^rootpassword: //')
 if [ "$rootpw" = "null" ]; then
@@ -39,25 +38,20 @@ if grep ^ntpservers: /etc/confluent/confluent.deploycfg > /dev/null; then
    echo '</ntp_servers></ntp-client>' >> /tmp/ntp.cfg
    ntpcfg=$(paste -sd '' /tmp/ntp.cfg)
 fi
-export confluent_mgr confluent_profile nodename
-run_remote pre.custom
-run_remote_parts pre.d
-if [ ! -e /tmp/installdisk ]; then
-    mdadm --assemble --scan
-    run_remote_python getinstalldisk
-    if grep ^md /tmp/installdisk > /dev/null; then
-    for md in /dev/disk/*/*; do
-        rmd=$(readlink $md)
-        if echo $rmd|grep $(cat /tmp/installdisk)$ > /dev/null; then
-            echo ${md#/dev/} > /tmp/installdisk
-        fi
-    done
-    fi
+mdadm --assemble --scan
+run_remote_python getinstalldisk
+if grep ^md /tmp/installdisk > /dev/null; then
+   for md in /dev/disk/*/*; do
+	rmd=$(readlink $md)
+	if echo $rmd|grep $(cat /tmp/installdisk)$ > /dev/null; then
+	    echo ${md#/dev/} > /tmp/installdisk
+	fi
+   done
 fi
 sed -e s'!'%%INSTDISK%%'!'/dev/$(cat /tmp/installdisk)'!' -e s'!'%%NODENAME%%'!'$nodename'!' -e 's!<networking\(.*\)>!'"$ntpcfg"'<networking\1>!' -e "s?%%ROOTPASSWORD%%?${rootpw}?" /tmp/profile/autoinst.xml > /tmp/profile/modified.xml
 if grep append /tmp/bootloader.xml > /dev/null; then
    sed -i 's@</general>@</general>'"$(tr -d '\n' < /tmp/bootloader.xml)"'@' /tmp/profile/modified.xml
 fi
 sed -i 's#root</username>#root</username>'"$(tr -d '\n' < /tmp/rootkeys.xml)"'#' /tmp/profile/modified.xml
-sed -i 's@%%TIMEZONE%%@'"$(cat /tmp/timezone.txt)"'@' /tmp/profile/modified.xml
+sed -i 's@/hwclock>@/hwclock>'"$(tr -d '\n' < /tmp/timezone)"'@' /tmp/profile/modified.xml
 sed -i 's@<media_url/>@'"$(tr -d '\n' < /tmp/pkgurl)"'@' /tmp/profile/modified.xml
@@ -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 = ''
@@ -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
@@ -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>
@@ -25,11 +26,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>SLES</product>
      </products>
+       %%ENDIFSLE%%
      <patterns config:type="list">
        <pattern>base</pattern>
      </patterns>
@@ -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>
@@ -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
@@ -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

@@ -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=$?
@@ -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
@@ -6,7 +6,6 @@
 exec >> /tmp/confluent-pre.log
 exec 2>> /tmp/confluent-pre.log
 chmod 600 /tmp/confluent-pre.log
-cat /tls/*.pem > /etc/confluent/ca.pem
 nodename=$(grep ^NODENAME /etc/confluent/confluent.info|awk '{print $2}')
 rootpw=$(grep rootpassword: /etc/confluent/confluent.deploycfg|sed -e 's/^rootpassword: //')
 if [ "$rootpw" = "null" ]; then
@@ -39,25 +38,20 @@ if grep ^ntpservers: /etc/confluent/confluent.deploycfg > /dev/null; then
    echo '</ntp_servers></ntp-client>' >> /tmp/ntp.cfg
    ntpcfg=$(paste -sd '' /tmp/ntp.cfg)
 fi
-export confluent_mgr confluent_profile nodename
-run_remote pre.custom
-run_remote_parts pre.d
-if [ ! -e /tmp/installdisk ]; then
-    mdadm --assemble --scan
-    run_remote_python getinstalldisk
-    if grep ^md /tmp/installdisk > /dev/null; then
-    for md in /dev/disk/*/*; do
-        rmd=$(readlink $md)
-        if echo $rmd|grep $(cat /tmp/installdisk)$ > /dev/null; then
-            echo ${md#/dev/} > /tmp/installdisk
-        fi
-    done
-    fi
+mdadm --assemble --scan
+run_remote_python getinstalldisk
+if grep ^md /tmp/installdisk > /dev/null; then
+   for md in /dev/disk/*/*; do
+	rmd=$(readlink $md)
+	if echo $rmd|grep $(cat /tmp/installdisk)$ > /dev/null; then
+	    echo ${md#/dev/} > /tmp/installdisk
+	fi
+   done
 fi
 sed -e s'!'%%INSTDISK%%'!'/dev/$(cat /tmp/installdisk)'!' -e s'!'%%NODENAME%%'!'$nodename'!' -e 's!<networking\(.*\)>!'"$ntpcfg"'<networking\1>!' -e "s?%%ROOTPASSWORD%%?${rootpw}?" /tmp/profile/autoinst.xml > /tmp/profile/modified.xml
 if grep append /tmp/bootloader.xml > /dev/null; then
    sed -i 's@</general>@</general>'"$(tr -d '\n' < /tmp/bootloader.xml)"'@' /tmp/profile/modified.xml
 fi
 sed -i 's#root</username>#root</username>'"$(tr -d '\n' < /tmp/rootkeys.xml)"'#' /tmp/profile/modified.xml
-sed -i 's@%%TIMEZONE%%@'"$(cat /tmp/timezone.txt)"'@' /tmp/profile/modified.xml
+sed -i 's@/hwclock>@/hwclock>'"$(tr -d '\n' < /tmp/timezone)"'@' /tmp/profile/modified.xml
 sed -i 's@<media_url/>@'"$(tr -d '\n' < /tmp/pkgurl)"'@' /tmp/profile/modified.xml
@@ -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 = ''
@@ -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
@@ -21,7 +21,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: $confluent_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)
@@ -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=$?
@@ -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
@@ -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 = ''
@@ -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=$?
@@ -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
@@ -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 = ''
@@ -129,10 +129,6 @@ int main(int argc, char* argv[]) {
    inet_pton(AF_INET, "239.255.255.250", &dst4.sin_addr);
    strncpy(msg,  "M-SEARCH * HTTP/1.1\r\nST: urn:xcat.org:service:confluent:", 1024);
    offset = strnlen(msg, 1024);
-    if (argc > 1 && strcmp(argv[1], "-a") == 0) {
-        strncpy(msg + offset, "/allconfluent=1", 1024 - offset);
-        offset = strnlen(msg, 1024);
-    }
    add_confluent_uuid(msg + offset, 1024 - offset);
    offset = strnlen(msg, 1024);
    add_uuid(msg + offset, 1024 - offset);
@@ -158,7 +154,7 @@ int main(int argc, char* argv[]) {
    }
    /* For now, bind to 190 to prove we are a privileged process */
    if (bind(n4, (const struct sockaddr *)&addr4, sizeof(addr4)) < 0) {
-        fprintf(stderr, "Error binding privilged port!\n");
+        fprintf(stderr, "Eror binding privilged port!\n");
        exit(1);
    }
    if (bind(ns, (const struct sockaddr *)&addr, sizeof(addr)) < 0) {
@@ -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
@@ -1,284 +0,0 @@
-#!/usr/bin/python3
-
-import argparse
-import os
-import socket
-import glob
-import ssl
-import sys
-path = os.path.dirname(os.path.realpath(__file__))
-path = os.path.realpath(os.path.join(path, '..', 'lib', 'python'))
-if path.startswith('/opt'):
-    # if installed into system path, do not muck with things
-    sys.path.append(path)
-import confluent.sshutil as sshutil
-import confluent.certutil as certutil
-import confluent.client as client
-import confluent.config.configmanager as configmanager
-import subprocess
-import tempfile
-import shutil
-import eventlet.green.socket as socket
-import eventlet
-import greenlet
-
-def fprint(txt):
-    sys.stdout.write(txt)
-    sys.stdout.flush()
-
-
-def tftp_works():
-    try:
-        subprocess.check_call(['curl', '--connect-timeout', '2', '-sf', 'tftp://localhost/confluent/x86_64/ipxe.efi', '-o', '/dev/null'])
-        return True
-    except Exception:
-        return False
-
-def emprint(txt):
-    if sys.stdout.isatty():
-        print('\x1b[1m\x1b[4m' + txt + '\x1b[0m')
-    else:
-        print(txt)
-
-def deployment_configured():
-    return os.path.exists('/var/lib/confluent/public/site/confluent_uuid')
-
-def webserver_listening():
-    try:
-        conn = socket.create_connection(('localhost', 443))
-        return conn
-    except Exception:
-        return False
-
-
-def certificates_missing_ips(conn):
-    # check if the tls can verify by the right CAs, then further
-    # check if all ip addresses are in the certificate offered
-    ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
-    ctx.check_hostname = False
-    for cacert in glob.glob('/var/lib/confluent/public/site/tls/*.pem'):
-        ctx.load_verify_locations(cacert)
-    sock = ctx.wrap_socket(conn)
-    crt = sock.getpeercert()
-    sans = crt.get('subjectAltName', [])
-    ips = certutil.get_ip_addresses()
-    missing_ips = []
-    for ip in ips:
-        for san in sans:
-            field, val = san
-            if val[-1] == '\n':
-                val = val[:-1]
-            if ':' in val:
-                # must normalize ipv6 to a sane value
-                val = socket.getaddrinfo(val, 443, proto=socket.IPPROTO_TCP)[0][-1][0]
-            if ip == val:
-                break
-        else:
-            missing_ips.append(ip)
-    return missing_ips
-
-
-def web_download_works():
-    try:
-        subprocess.check_call(['curl', '-skf', 'https://localhost/confluent-public/site/confluent_uuid', '-o', '/dev/null'])
-    except Exception:
-        return False
-    return True
-            
-def web_api_works():
-    try:
-        res = subprocess.check_output(['curl', '-X', 'GET', '-Isk', 'https://localhost/confluent-api/'])
-        res = res.split(b'\n')[0]
-        if b'401' in res:
-            return True
-        return False
-    except Exception:
-        return False
-    return True
-
-def nics_missing_ipv6():
-    # check for ability to create AF_INET6, for kernel disabled ipv6
-    a = socket.socket(socket.AF_INET6)
-    ipaddrs = subprocess.check_output(['ip', '-br', 'a']).split(b'\n')
-    missingnics = []
-    for line in ipaddrs:
-        comps = line.split()
-        if not comps:
-            continue
-        iname, state = comps[:2]
-        if iname == b'lo':
-            continue
-        addrs = comps[2:]
-        hasv6 = False
-        hasv4 = False
-        for addr in addrs:
-            if b'.' in addr:
-                hasv4 = True
-            if addr.startswith(b'fe80::'):
-                hasv6 = True
-        if hasv4 and not hasv6:
-            missingnics.append(iname.decode('utf8'))
-    return missingnics
-
-def insecure_boot_attempts():
-    insecurenodes = set([])
-    with open('/var/log/confluent/events') as eventin:
-        line = True
-        while line:
-            line = eventin.readline()
-            if 'insecure mode is disabled' in line:
-                line = line.split()
-                insecurenodes.add(line[7])
-    for node in insecurenodes:
-        currattr = subprocess.check_output(['nodeattrib', node, 'deployment.useinsecureprotocols'])
-        currattr = currattr.split()
-        if len(currattr) > 2 and currattr[2] == b'firmware':
-            continue
-        else:
-            return True
-    return False
-
-
-def uuid_matches():
-    with open('/var/lib/confluent/public/site/confluent_uuid', 'r') as uuidf:
-        fsuuid = uuidf.read().strip()
-    dbuuid = configmanager.get_global('confluent_uuid')
-    return dbuuid == fsuuid
-
-def lookup_node(node):
-    try:
-        return socket.getaddrinfo(node, 0)
-    except greenlet.GreenletExit:
-        return None
-    except Exception:
-        return None
-
-if __name__ == '__main__':
-    ap = argparse.ArgumentParser(description='Run configuration checks for a system running confluent service')
-    ap.add_argument('-n', '--node', help='A node name to run node specific checks against')
-    args, extra = ap.parse_known_args(sys.argv)
-    if len(extra) > 1:
-        ap.print_help()
-        sys.exit(1)
-    sys.stdout.write('OS Deployment: ')
-    sys.stdout.flush()
-    if deployment_configured():
-        print("Initialized")
-        sys.stdout.write('Confluent UUID: ')
-        sys.stdout.flush()
-        if uuid_matches():
-            print('Consistent')
-        else:
-            emprint('Inconsistent between confluent database and /var/lib/confluent (Example resolution: confetty set /uuid resync=1)')
-        fprint('Web Server: ')
-        conn = webserver_listening()
-        if conn:
-            print('Running')
-            fprint('Web Certificate: ')
-            cert = certificates_missing_ips(conn)
-            if cert:
-                cert = ', '.join(cert)
-                emprint('Addresses missing from certificate: {0} (Example resolution: osdeploy initialize -t)'.format(cert))
-            else:
-                print('OK')
-                fprint('Checking web download: ')
-                if web_download_works():
-                    print('OK')
-                else:
-                    emprint('Failed to download /confluent-public/site/confluent_uuid')
-                fprint('Checking web API access: ')
-                if web_api_works():
-                    print('OK')
-                else:
-                    emprint('Failed access, if selinux is enabled, `setsebool -P httpd_can_network_connect=1`, otherwise check web proxy configuration')
-        else:
-            emprint('Not Running (Example resolution: systemctl enable httpd --now)')
-        fprint('TFTP Status: ')
-        if tftp_works():
-            print('OK')
-        else:
-            emprint('TFTP failure, PXE will not work, though media and HTTP boot can still work. (Example resolution: osdeploy initialize -p)')
-        fprint('SSH root user public key: ')
-        if glob.glob('/var/lib/confluent/public/site/ssh/*.rootpubkey'):
-            print('OK')
-        else:
-            emprint('No trusted ssh keys for root user, passwordless SSH from managers to nodes may not work (Example resolution: osdeploy initialize -u)')
-        if sshutil.sshver() > 7.6:
-            fprint('Checking SSH Certificate authority: ')
-            try:
-                sshutil.prep_ssh_key('/etc/confluent/ssh/ca')
-                print('OK')
-            except Exception:
-                emprint('Failed to load SSH authority key, deployed servers will not have host certificates for known_hosts and users may be unable to ssh between nodes without a password (Example resolution: osdeploy initialize -s)')            
-            fprint('Checking confluent SSH automation key: ')
-            try:
-                sshutil.prep_ssh_key('/etc/confluent/ssh/automation')
-                print('OK')
-            except subprocess.CalledProcessError:
-                emprint('Failed to load confluent automation key, syncfiles and profile ansible plays will not work (Example resolution: osdeploy initialize -a)')
-        fprint('Checking for blocked insecure boot: ')
-        if insecure_boot_attempts():
-            emprint('Some nodes are attempting network boot using PXE or HTTP boot, but the node is not configured to allow this (Example resolution: nodegroupattrib everything deployment.useinsecureprotocols=firmware)')
-        else:
-            print('OK')
-        fprint('Checking IPv6 enablement: ')
-        nics = nics_missing_ipv6()
-        if nics:
-            snics = ','.join(nics)
-            emprint('Some interfaces ({0}) have ipv6 disabled, and may be unable to fully perform discovery or deployment (Example resolution: nmcli c m {1} ipv6.method link-local )'.format(snics, nics[0]))
-        else:
-            print('OK')
-    else:
-        print("Uninitialized, further OS deployment checks skipped, see `osdeploy initialize` to set up OS deployment feature")
-    if args.node:
-        print("Performing node checks for '{}'".format(args.node))
-        print("Checking node attributes in confluent...")
-        sess = client.Command()
-        allok = True
-        uuidok = False
-        macok = False
-        for rsp in sess.read(f'/nodes/{args.node}/attributes/all'):
-            if rsp.get('errorcode', None) == 404:
-                emprint(f'There is no node named "{args.node}"')
-                allok = False
-                uuidok = True  # not really, but suppress the spurious error
-            uuid = rsp.get('id.uuid', {}).get('value', None)
-            if uuid:
-                uuidok = True
-            if 'deployment.useinsecureprotocols' in rsp:
-                insec = rsp.get('deployment.useinsecureprotocols', {}).get('value', None)
-                if insec != 'firmware':
-                    emprint(f'{args.node} does not have deployment.useinsecureprotocols set to firmware. This is fine for USB boot. HTTP boot can work, but requires the deployment server CA certificates be provisioned to the UEFI first.  PXE and HTTP boot without preprovisioned certificates will fail.')
-            for key in rsp:
-                if key.endswith('.hwaddr'):
-                    mac = rsp[key].get('value', None)
-                    if mac:
-                        macok = True
-        if not uuidok and not macok:
-            allok = False
-            emprint(f'{args.node} does not have a uuid or mac address defined in id.uuid or net.*hwaddr, deployment will not work')
-        if allok:
-            print(f'No issues detected with attributes of {args.node}')
-        fprint("Checking name resolution: ")
-        lk = eventlet.spawn(lookup_node, args.node)
-        eventlet.sleep(0.1)
-        tries = 5
-        while not lk.dead and tries > 0:
-            eventlet.sleep(1)
-            tries -= 1
-        deaddns = False
-        if not tries:
-            emprint('Name resolution takes too long, check state of /etc/resolv.conf and indicated nameservers, this can produce failure to netboot or failure to commence installation')
-            lk.kill()
-            deaddns = True
-        result = lk.wait()
-        if not result and not deaddns:
-            emprint('Name resolution failed for node, it is normally a good idea for the node name to resolve to an IP')
-        if result:
-            print("OK")
-    else:
-        print("Skipping node checks, no node specified (Example: confluent_selfcheck -n n1)")
-# possible checks:
-# arping on the node, check for dupes/against nodeinventory?
-# arping -D for mgt own ip addresses? check for dupes, also check for bleed through from one nic to another
-# iterate through profiles, use mtools to extract site initramfs, check if outdated
@@ -69,11 +69,7 @@ if args[0] == 'restore':
    if options.interactivepassword:
        password = getpass.getpass('Enter password to restore backup: ')
    try:
-        cfm.init(True)
-        cfm.statelessmode = True
        cfm.restore_db_from_directory(dumpdir, password)
-        cfm.statelessmode = False
-        cfm.ConfigManager.wait_for_sync(True)
        if owner != 0:
            for targdir in os.walk('/etc/confluent'):
                os.chown(targdir[0], owner, group)
@@ -56,8 +56,6 @@ def main(args):
        help='Push profile.yaml of the named profile data into boot assets as appropriate')
    upb.add_argument('profile', help='Profile to update boot assets')
    osls = sp.add_parser('list', help='List OS images available for deployment')
-    ubp = sp.add_parser('rebase', help='Update stock profile content from packaged updates')
-    ubp.add_argument('profile', help='Profile to rebase from packaged content')
    cmdset = ap.parse_args()

    if cmdset.command == 'list':
@@ -68,8 +66,6 @@ def main(args):
        return initialize(cmdset)
    if cmdset.command == 'updateboot':
        return updateboot(cmdset.profile)
-    if cmdset.command == 'rebase':
-        return rebase(cmdset.profile)
    ap.print_help()


@@ -282,33 +278,21 @@ def initialize(cmdset):
        init_confluent_myname()
        certutil.create_certificate()
        if os.path.exists('/usr/lib/systemd/system/httpd.service'):
-            try:
-                subprocess.check_call(['systemctl', 'try-restart', 'httpd'])
-                print('HTTP server has been restarted if it was running')
-            except subprocess.CalledProcessError:
-                emprint('New HTTPS certificates generated, restart the web server manually')
+            subprocess.check_call(['systemctl', 'try-restart', 'httpd'])
+            print('HTTP server has been restarted if it was running')
        elif os.path.exists('/usr/lib/systemd/system/apache2.service'):
-            try:
-                subprocess.check_call(['systemctl', 'try-restart', 'apache2'])
-                print('HTTP server has been restarted if it was running')
-            except subprocess.CalledProcessError:
-                emprint('New HTTPS certificates generated, restart the web server manually')
+            subprocess.check_call(['systemctl', 'try-restart', 'apache2'])
+            print('HTTP server has been restarted if it was running')
        else:
            emprint('New HTTPS certificates generated, restart the web server manually')
    if cmdset.s:
        didsomething = True
        init_confluent_myname()
-        try:
-            sshutil.initialize_ca()
-        except sshutil.AlreadyExists:
-            emprint('Skipping generation of SSH CA, already present and would likely be more problematic to regenerate than to reuse (if absolutely sure you want to discard old CA, then delete /etc/confluent/ssh/ca*)')
+        sshutil.initialize_ca()
    if cmdset.a:
        didsomething = True
        init_confluent_myname()
-        try:
-            sshutil.initialize_root_key(True, True)
-        except sshutil.AlreadyExists:
-            emprint('Skipping generation of new automation key, already present and regeneration usually causes more problems. (If absolutely certain, delete /etc/confluent/ssh/automation*)')
+        sshutil.initialize_root_key(True, True)
    if cmdset.p:
        install_tftp_content()
    if cmdset.l:
@@ -420,19 +404,6 @@ def updateboot(profilename):
            print(repr(rsp))


-def rebase(profilename):
-    c = client.Command()
-    for rsp in c.update('/deployment/profiles/{0}'.format(profilename), {'rebase': 1}):
-        if 'updated' in rsp:
-            print('Updated: {0}'.format(rsp['updated']))
-        elif 'customized' in rsp:
-            print('Skipping update of {0} as current copy was customized or no manifest data was available'.format(rsp['customized']))
-        elif 'error' in rsp:
-            sys.stderr.write(rsp['error'] + '\n')
-            sys.exit(rsp['errorcode'])
-        else:
-            print(repr(rsp))
-
 def oslist():
    c = client.Command()
    print("Distributions:")
@@ -75,7 +75,6 @@ _allowedbyrole = {
            '/node*/configuration/*',
        ],
        'start': [
-            '/sessions/current/async',
            '/nodes/*/console/session*',
            '/nodes/*/shell/sessions*',
        ],
@@ -85,16 +84,10 @@ _allowedbyrole = {
        ],
    },
    'Monitor': {
-        'start': [
-            '/sessions/current/async',
-        ],
        'retrieve': [
            '/node*/health/hardware',
            '/node*/power/state',
            '/node*/sensors/*',
-            '/node*/attributes/current',
-            '/node*/description',
-            '/noderange/*/nodes/',
            '/nodes/',
            '/',
        ],
@@ -110,9 +110,6 @@ node = {
    'crypted.selfapikey': {
        'description': ('Crypt of api key for self api requests by node'),
    },
-    'trusted.subnets': {
-        'description': 'Remote subnets in CIDR notation that should be considered as trusted as local networks'
-    },
    'deployment.encryptboot': {
        'description': ('Specify a strategy for encrypting the volume. Support '
                        'for this setting is currently only enabled for '
@@ -127,13 +124,10 @@ node = {
    'deployment.apiarmed': {
        'description': ('Indicates whether the node authentication token interface '
                        'is armed.  If set to once, it will grant only the next '
-                        'request. If set to continuous, will allow many requests, '
-                        'which greatly reduces security, particularly when connected to '
-                        'untrusted networks. '
-                        'Should not be set unless an OS deployment is pending on the node. '
+                        'request. If set to continuous, will allow many requests.'
+                        'Should not be set unless an OS deployment is pending. '
                        'Generally this is not directly modified, but is modified '
                        'by the "nodedeploy" command'),
-        'validvalues': ('once', 'continuous', ''),
    },
    'deployment.sealedapikey': {
        'description': 'This attribute is used by some images to save a sealed '
@@ -253,10 +247,6 @@ node = {
                        'and any restrictions around reusing an old password.',
        'validlistkeys': ('expiration', 'loginfailures', 'complexity', 'reuse'),
    },
-    'discovery.nodeconfig': {
-        'description':  'Set of nodeconfig arguments to apply after automatic discovery'
-
-    },
    'discovery.policy': {
        'description':  'Policy to use for auto-configuration of discovered '
                        'and identified nodes. Valid values are "manual", '
@@ -266,7 +256,7 @@ node = {
                        'so long as the node has no existing public key. '
                        '"open" allows discovery even if a known public key '
                        'is already stored',
-        'validlist': ('manual', 'permissive', 'pxe', 'open', 'verified'),
+        'validlist': ('manual', 'permissive', 'pxe', 'open'),
    },
    'info.note': {
        'description':  'A field used for administrators to make arbitrary '
@@ -390,9 +380,7 @@ node = {
 #    },
    'hardwaremanagement.manager': {
        'description': 'The management address dedicated to this node.  This '
-                       'is the address of, for example, the Lenovo XCC.  It may optionally '
-                       'include /<prefixlen> CIDR suffix to indicate subnet length, which is '
-                       'autodetected by default where possible.',
+                       'is the address of, for example, the Lenovo IMM.',
    },
    'hardwaremanagement.method': {
        'description': 'The method used to perform operations such as power '
@@ -462,10 +450,10 @@ node = {
    },
    'net.interface_names': {
        'description': 'Interface name or comma delimited list of names to match for this interface. It is generally recommended '
-                       'to leave this blank unless needing to set up interfaces that are not on a common subnet with a confluent server, '
-                       'as confluent servers provide autodetection for matching the correct network definition to an interface.'
-                       'This would be the default name per the deployed OS and can be a comma delimited list to denote members of '
-                       'a team'
+                        'to leave this blank unless needing to set up interfaces that are not on a common subnet with a confluent server, '
+                        'as confluent servers provide autodetection for matching the correct network definition to an interface.'
+                        'This would be the default name per the deployed OS and can be a comma delimited list to denote members of '
+                        'a team'
    },
    'net.ipv4_address': {
        'description': 'When configuring static, use this address.  If '
@@ -479,10 +467,8 @@ node = {
        'description': 'Whether to use static or dhcp when configuring this '
                       'interface for IPv4. "firmwaredhcp" means to defer to '
                       'external DHCP server during firmware execution, but '
-                       'use static for OS. "firmwarenone" means to suppress '
-                       'even the no-IP dhcp offers, to fully delegate to an external '
-                       'dhcp/pxe configuration, even for confluent deployment.',
-        'validvalues': ('dhcp', 'static', 'firmwaredhcp', 'firmwarenone', 'none')
+                       'use static for OS',
+        'validvalues': ('dhcp', 'static', 'firmwaredhcp', 'none')
    },
    'net.ipv4_gateway': {
        'description':  'The IPv4 gateway to use if applicable.  As is the '
@@ -501,10 +487,8 @@ node = {
        'description': 'Whether to use static or dhcp when configuring this '
                       'interface for IPv6. "firmwaredhcp" means to defer to '
                       'external DHCP server during firmware execution, but '
-                       'use static for OS. "firmwarenone" means to suppress '
-                       'even the no-IP dhcp offers, to fully delegate to an external '
-                       'dhcp/pxe configuration, even for confluent deployment',
-        'validvalues': ('dhcp', 'static', 'firmwaredhcp', 'firmwarenone', 'none')
+                       'use static for OS',
+        'validvalues': ('dhcp', 'static', 'firmwaredhcp', 'none')
    },
    'net.ipv6_gateway': {
        'description':  'The IPv6 gateway to use if applicable.  As is the '
@@ -565,8 +565,6 @@ def _load_dict_from_dbm(dpath, tdb):
                currdict[tks] = cPickle.loads(dbe[tk]) # nosec
                tk = dbe.nextkey(tk)
    except dbm.error:
-        if os.path.exists(tdb):
-            raise
        return


@@ -2464,20 +2462,12 @@ class ConfigManager(object):
                self.set_group_attributes(tmpconfig[confarea], True)
            elif confarea == 'usergroups':
                for usergroup in tmpconfig[confarea]:
-                    role = tmpconfig[confarea][usergroup].get('role', 'Administrator')
-                    self.create_usergroup(usergroup, role=role)
+                    self.create_usergroup(usergroup)
            elif confarea == 'users':
                for user in tmpconfig[confarea]:
-                    ucfg = tmpconfig[confarea][user]
-                    uid = ucfg.get('id', None)
-                    if uid is not None and not isinstance(uid, str):
-                        if isinstance(uid, bytes):
-                            uid = uid.decode('utf8')
-                        else:
-                            uid = uid.encode('utf8')
-                    displayname = ucfg.get('displayname', None)
-                    role = ucfg.get('role', None)
-                    self.create_user(user, uid=uid, displayname=displayname, role=role)
+                    uid = tmpconfig[confarea].get('id', None)
+                    displayname = tmpconfig[confarea].get('displayname', None)
+                    self.create_user(user, uid=uid, displayname=displayname)
                    for attrname in ('authid', 'authenticators', 'cryptpass'):
                        if attrname in tmpconfig[confarea][user]:
                            self._cfgstore['users'][user][attrname] = tmpconfig[confarea][user][attrname]
@@ -2614,13 +2604,7 @@ class ConfigManager(object):
                    with _dirtylock:
                        dirtyglobals = copy.deepcopy(_cfgstore['dirtyglobals'])
                        del _cfgstore['dirtyglobals']
-                try:
-                    globalf = dbm.open(os.path.join(cls._cfgdir, "globals"), 'c', 384)  # 0600
-                except dbm.error:
-                    if not fullsync:
-                        raise
-                    os.remove(os.path.join(cls._cfgdir, "globals"))
-                    globalf = dbm.open(os.path.join(cls._cfgdir, "globals"), 'c', 384)  # 0600
+                globalf = dbm.open(os.path.join(cls._cfgdir, "globals"), 'c', 384)  # 0600
                try:
                    for globalkey in dirtyglobals:
                        if globalkey in _cfgstore['globals']:
@@ -2633,15 +2617,8 @@ class ConfigManager(object):
                    globalf.close()
            if fullsync or 'collectivedirty' in _cfgstore:
                if len(_cfgstore.get('collective', ())) > 1:
-                    try:
-                        collectivef = dbm.open(os.path.join(cls._cfgdir, 'collective'),
-                                            'c', 384)
-                    except dbm.error:
-                        if not fullsync:
-                            raise
-                        os.remove(os.path.join(cls._cfgdir, 'collective'))
-                        collectivef = dbm.open(os.path.join(cls._cfgdir, 'collective'),
-                                            'c', 384)
+                    collectivef = dbm.open(os.path.join(cls._cfgdir, "collective"),
+                                        'c', 384)
                    try:
                        if fullsync:
                            colls = _cfgstore['collective']
@@ -2668,13 +2645,7 @@ class ConfigManager(object):
                currdict = _cfgstore['main']
                for category in currdict:
                    _mkpath(pathname)
-                    try:
-                        dbf = dbm.open(os.path.join(pathname, category), 'c', 384)  # 0600
-                    except dbm.error:
-                        if not fullsync:
-                            raise
-                        os.remove(os.path.join(pathname, category))
-                        dbf = dbm.open(os.path.join(pathname, category), 'c', 384)  # 0600
+                    dbf = dbm.open(os.path.join(pathname, category), 'c', 384)  # 0600
                    try:
                        for ck in currdict[category]:
                            dbf[ck] = cPickle.dumps(currdict[category][ck], protocol=cPickle.HIGHEST_PROTOCOL)
@@ -2694,13 +2665,7 @@ class ConfigManager(object):
                        currdict = _cfgstore['tenant'][tenant]
                    for category in dkdict:
                        _mkpath(pathname)
-                        try:
-                            dbf = dbm.open(os.path.join(pathname, category), 'c', 384)  # 0600
-                        except dbm.error:
-                            if not fullsync:
-                                raise
-                            os.remove(os.path.join(pathname, category))
-                            dbf = dbm.open(os.path.join(pathname, category), 'c', 384)  # 0600
+                        dbf = dbm.open(os.path.join(pathname, category), 'c', 384)  # 0600
                        try:
                            for ck in dkdict[category]:
                                if ck not in currdict[category]:
@@ -138,7 +138,6 @@ def load_plugins():
        plugins.clear()
        # restore path to not include the plugindir
        sys.path.pop(1)
-    disco.register_affluent(pluginmap['affluent'])


 def _register_resource(plugin):
@@ -193,21 +192,10 @@ def handle_deployment(configmanager, inputdata, pathcomponents,
            return
        if len(pathcomponents) == 3:
            profname = pathcomponents[-1]
-            if operation == 'update':
-                if 'updateboot' in inputdata:
-                    osimage.update_boot(profname)
-                    yield msg.KeyValueData({'updated': profname})
-                    return
-                elif 'rebase' in inputdata:
-                    try:
-                        updated, customized = osimage.rebase_profile(profname)
-                    except osimage.ManifestMissing:
-                        raise exc.InvalidArgumentException('Specified profile {0} does not have a manifest.yaml for rebase'.format(profname))
-                    for upd in updated:
-                        yield msg.KeyValueData({'updated': upd})                        
-                    for cust in customized:
-                        yield msg.KeyValueData({'customized': cust})
-                    return
+            if operation == 'update' and 'updateboot' in inputdata:
+                osimage.update_boot(profname)
+                yield msg.KeyValueData({'updated': profname})
+                return
    if pathcomponents[1] == 'importing':
        if len(pathcomponents) == 2 or not pathcomponents[-1]:
            if operation == 'retrieve':
@@ -1247,10 +1235,6 @@ def handle_path(path, operation, configmanager, inputdata=None, autostrip=True):
    elif pathcomponents[0] == 'version':
        return (msg.Attributes(kv={'version': confluent.__version__}),)
    elif pathcomponents[0] == 'uuid':
-        if operation == 'update':
-             with open('/var/lib/confluent/public/site/confluent_uuid', 'r') as uuidf:
-                fsuuid = uuidf.read().strip()
-                cfm.set_global('confluent_uuid', fsuuid)
        return (msg.Attributes(kv={'uuid': cfm.get_global('confluent_uuid')}),)
    elif pathcomponents[0] == 'usergroups':
        # TODO: when non-administrator accounts exist,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jarrod Johnson	75a951c8a7	Enable more plugins for collective routing	2022-07-13 08:57:54 -04:00
Jarrod Johnson	60df685640	Prevent shell session from playing console output	2022-06-30 14:16:31 -04:00
Jarrod Johnson	86f13db803	Allow blanking a value to default a plugin attribute	2022-06-30 14:16:23 -04:00
Jarrod Johnson	247cabd7ca	Add log message for mac interrogation of switch Clarify when things go wrong due to certificate.	2022-06-30 14:16:15 -04:00
Jarrod Johnson	b62855c84b	Fix syntax error in el7 prescript	2022-06-30 14:15:57 -04:00
Jarrod Johnson	384457908b	Fix EL7 typeo in postscript	2022-06-30 14:15:50 -04:00
Jarrod Johnson	31f71ac961	Adjust to correct ntp for 9 and up	2022-06-30 14:15:43 -04:00
Jarrod Johnson	1632c94c3c	Install apiclient in a normal location for EL7	2022-06-30 14:15:34 -04:00
Jarrod Johnson	f9aab2a640	Add old profile compatible apiclient location	2022-06-30 14:15:25 -04:00
Jarrod Johnson	931fa54092	Fix EL7 deployment compatibility	2022-06-30 14:15:18 -04:00