Have SSDP ignore multicast disabled interfaces

LICENSE

@@ -175,3 +175,28 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,30 +0,0 @@
-# Confluent
-
-![Python 3](https://img.shields.io/badge/python-3-blue.svg) [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/xcat2/confluent/blob/master/LICENSE)
-
-Confluent is a software package to handle essential bootstrap and operation of scale-out server configurations.
-It supports stateful and stateless deployments for various operating systems.
-
-Check [this page](https://hpc.lenovo.com/users/documentation/whatisconfluent.html
-) for a more detailed list of features.
-
-Confluent is the modern successor of [xCAT](https://github.com/xcat2/xcat-core).
-If you're coming from xCAT, check out [this comparison](https://hpc.lenovo.com/users/documentation/confluentvxcat.html).
-
-# Documentation
-
-Confluent documentation is hosted on hpc.lenovo.com: https://hpc.lenovo.com/users/documentation/
-
-# Download
-
-Get the latest version from: https://hpc.lenovo.com/users/downloads/
-
-Check release notes on: https://hpc.lenovo.com/users/news/
-
-# Open Source License
-
-Confluent is made available under the Apache 2.0 license: https://opensource.org/license/apache-2-0
-
-# Developers
-
-Want to help? Submit a [Pull Request](https://github.com/xcat2/confluent/pulls).

confluent_client/COPYRIGHT

@@ -1,77 +0,0 @@
-Project: https://hpc.lenovo.com/users/
-Source: https://github.com/lenovo/confluent
-Upstream-Name: confluent-client
-
-All file of the Confluent-client software is distributed under the terms of an Apache-2.0 license as indicated below: 
-
-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, 
-      tlvdata.py
-Copyright: 2014 IBM Corporation
-           2015-2016 Lenovo
-License: Apache-2.0
-
-File: tlv.py
-Copyright: 2014 IBM Corporation
-License: Apache-2.0
-
-License: Apache-2.0
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of this License; and
-You must cause any modified files to carry prominent notices stating that You changed the files; and
-You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS

confluent_client/bin/collate

@@ -21,7 +21,6 @@
 
 import optparse
 import os
-import re
 import select
 import sys
 
@@ -85,7 +84,6 @@ fullline = sys.stdin.readline()
 printpending = True
 clearpending = False
 holdoff = 0
-padded = None
 while fullline:
     for line in fullline.split('\n'):
         if not line:
@@ -94,18 +92,13 @@ while fullline:
             line = 'UNKNOWN: ' + line
         if options.log:
             node, output = line.split(':', 1)
-            if padded is None:
-                if output.startswith(' '):
-                    padded = True
-                else:
-                    padded = False
-            if padded:
-                output = re.sub(r'^ ', '', output)
+            output = output.lstrip()
             currlog = options.log.format(node=node, nodename=node)
             with open(currlog, mode='a')  as log:
                 log.write(output + '\n')
             continue
         node, output = line.split(':', 1)
+        output = output.lstrip()
         grouped.add_line(node, output)
         if options.watch:
             if not holdoff:

confluent_client/bin/confetty

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

confluent_client/bin/confluent2hosts

@@ -157,7 +157,7 @@ def main():
                         elif attrib.endswith('.ipv6_address') and val:
                             ip6bynode[node][currnet] = val.split('/', 1)[0]
                         elif attrib.endswith('.hostname'):
-                            namesbynode[node][currnet] = re.split(r'\s+|,', val)
+                            namesbynode[node][currnet] = re.split('\s+|,', val)
         for node in ip4bynode:
             mydomain = domainsbynode.get(node, None)
             for ipdb in (ip4bynode, ip6bynode):

confluent_client/bin/confluent2xcat

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

confluent_client/bin/dir2img

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

confluent_client/bin/l2traceroute

@@ -1,173 +0,0 @@
-#!/usr/libexec/platform-python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2017 Lenovo
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-__author__ = 'tkucherera'
-
-import optparse
-import os
-import signal
-import sys
-import subprocess
-
-try:
-    signal.signal(signal.SIGPIPE, signal.SIG_DFL)
-except AttributeError:
-    pass
-path = os.path.dirname(os.path.realpath(__file__))
-path = os.path.realpath(os.path.join(path, '..', 'lib', 'python'))
-if path.startswith('/opt'):
-    sys.path.append(path)
-
-import confluent.client as client
-
-argparser = optparse.OptionParser(
-    usage="Usage: %prog <start_node> -i <interface> <end_node> -e <eface>",
-)
-argparser.add_option('-i', '--interface', type='str',
-                    help='interface to check path against for the start node')
-argparser.add_option('-e', '--eface', type='str',
-                    help='interface to check path against for the end node')
-argparser.add_option('-c', '--cumulus', action="store_true", dest="cumulus",
-                    help='return layer 2 route through cumulus switches only')
-
-(options, args) = argparser.parse_args()
-
-try:
-    start_node = args[0]
-    end_node = args[1]
-    interface = options.interface
-    eface = options.eface
-except IndexError:
-    argparser.print_help()
-    sys.exit(1)
-
-session = client.Command()
-
-def get_neighbors(switch):
-    switch_neigbors = []
-    url = '/networking/neighbors/by-switch/{0}/by-peername/'.format(switch)
-    for neighbor in session.read(url):
-        switch = neighbor['item']['href'].strip('/')
-        if switch in all_switches:
-            switch_neigbors.append(switch)
-    return switch_neigbors
-
-def find_path(start, end, path=[]):
-    path = path + [start]
-    if start == end:
-        return path  # If start and end are the same, return the path
-
-    for node in get_neighbors(start):
-        if node not in path:
-            new_path = find_path(node, end, path)
-            if new_path:
-                return new_path  # If a path is found, return it
-
-    return None  # If no path is found, return None
-
-def is_cumulus(switch):
-    try:
-        read_attrib = subprocess.check_output(['nodeattrib', switch, 'hardwaremanagement.method'])
-    except subprocess.CalledProcessError:
-        return False
-    for attribs in read_attrib.decode('utf-8').split('\n'):
-        if len(attribs.split(':')) > 1:
-            attrib = attribs.split(':')
-            if attrib[2].strip() == 'affluent':
-                return True
-            else:
-                return False
-        else:
-            return False
-
-
-def host_to_switch(node, interface=None):
-    # first check the the node config to see what switches are connected
-    # if host is in rhel can use nmstate package
-    if node in all_switches:
-        return [node]
-    switches = []
-    netarg = 'net.*.switch'
-    if interface:
-        netarg = 'net.{0}.switch'.format(interface)
-    try:
-        read_attrib = subprocess.check_output(['nodeattrib', node, netarg])
-    except subprocess.CalledProcessError:
-        return False
-    for attribs in read_attrib.decode('utf-8').split('\n'):
-        attrib = attribs.split(':')
-        try:
-            if ' net.mgt.switch' in attrib or attrib[2] == '':
-                continue
-        except IndexError:
-            continue
-        switch = attrib[2].strip()
-        if is_cumulus(switch) and options.cumulus:
-            switches.append(switch)
-        else:
-            switches.append(switch)
-    return switches
-
-def path_between_nodes(start_switches, end_switches):
-    for start_switch in start_switches:
-        for end_switch in end_switches:
-            if start_switch == end_switch:
-                return [start_switch]
-            else:
-                path = find_path(start_switch, end_switch)
-                if path:
-                    return path
-                else:
-                    return 'No path found'
-
-
-all_switches = []
-for res in session.read('/networking/neighbors/by-switch/'):
-    if 'error' in res:
-        sys.stderr.write(res['error'] + '\n')
-        exitcode = 1
-    else:
-        switch = (res['item']['href'].replace('/', ''))
-        all_switches.append(switch)
-
-end_nodeslist = []
-nodelist = '/noderange/{0}/nodes/'.format(end_node)
-for res in session.read(nodelist):
-    if 'error' in res:
-        sys.stderr.write(res['error'] + '\n')
-        exitcode = 1
-    else:
-        elem=(res['item']['href'].replace('/', ''))
-        end_nodeslist.append(elem)
-
-start_switches = host_to_switch(start_node, interface)
-for end_node in end_nodeslist:
-    if end_node:
-        end_switches = host_to_switch(end_node, eface)
-        if not end_switches:
-            print('Error: net.{0}.switch attribute is not valid')
-            continue
-        path = path_between_nodes(start_switches, end_switches)
-        print(f'{start_node} to {end_node}: {path}')
-
-# TODO dont put switches that are connected through management interfaces. 
-
-
-    
-
-
-

confluent_client/bin/nodeapply

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

confluent_client/bin/nodeattrib

@@ -22,7 +22,6 @@ import optparse
 import os
 import signal
 import sys
-import shlex
 
 try:
     signal.signal(signal.SIGPIPE, signal.SIG_DFL)
@@ -54,8 +53,6 @@ argparser.add_option('-p', '--prompt', action='store_true',
 argparser.add_option('-m', '--maxnodes', type='int',
                      help='Prompt if trying to set attributes on more '
                           'than specified number of nodes')
-argparser.add_option('-s', '--set', dest='set', metavar='settings.batch',
-                     default=False, help='set attributes using a batch file')
 (options, args) = argparser.parse_args()
 
 
@@ -112,28 +109,10 @@ elif options.clear or options.environment or options.prompt:
     sys.stderr.write('Attribute names required with specified options\n')
     argparser.print_help()
     exitcode = 400
-
-elif options.set:
-    arglist = [noderange]
-    showtype='current'
-    argfile = open(options.set, 'r')
-    argset = argfile.readline()
-    while argset:
-        try:
-            argset = argset[:argset.index('#')]
-        except ValueError:
-            pass
-        argset = argset.strip()
-        if argset:
-            arglist += shlex.split(argset)
-        argset = argfile.readline()
-    session.stop_if_noderange_over(noderange, options.maxnodes)
-    exitcode=client.updateattrib(session,arglist,nodetype, noderange, options, None)
 if exitcode != 0:
     sys.exit(exitcode)
 
 # Lists all attributes
-
 if len(args) > 0:
     # setting output to all so it can search since if we do have something to search, we want to show all outputs even if it is blank.
     if requestargs is None:

confluent_client/bin/nodebmcpassword

@@ -1,121 +0,0 @@
-#!/usr/libexec/platform-python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2015-2017 Lenovo
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-__author__ = 'tkucherera'
-
-from getpass import getpass
-import optparse
-import os
-import signal
-import sys
-try:
-    signal.signal(signal.SIGPIPE, signal.SIG_DFL)
-except AttributeError:
-    pass
-
-path = os.path.dirname(os.path.realpath(__file__))
-path = os.path.realpath(os.path.join(path, '..', 'lib', 'python'))
-if path.startswith('/opt'):
-    sys.path.append(path)
-
-import confluent.client as client
-
-argparser = optparse.OptionParser(usage="Usage: %prog <noderange> <username> <new_password>")
-argparser.add_option('-m', '--maxnodes', type='int',
-                     help='Number of nodes to affect before prompting for confirmation')
-argparser.add_option('-p', '--prompt', action='store_true',
-                     help='Prompt for password values interactively')
-argparser.add_option('-e', '--environment', action='store_true',
-                     help='Set passwod, but from environment variable of '
-                          'same name')
-
-
-
-(options, args) = argparser.parse_args()
-
-
-try:
-    noderange = args[0]
-    username = args[1]
-except IndexError:
-    argparser.print_help()
-    sys.exit(1)
-    
-client.check_globbing(noderange)
-session = client.Command()
-exitcode = 0
-
-if options.prompt:
-    oneval = 1
-    twoval = 2
-    while oneval != twoval:
-        oneval = getpass('Enter pass for {0}: '.format(username))
-        twoval = getpass('Confirm pass for {0}: '.format(username))
-        if oneval != twoval:
-            print('Values did not match.')
-    new_password = twoval
-
-elif len(args) == 3:
-    if options.environment:
-        key = args[2]
-        new_password = os.environ.get(key, os.environ[key.upper()])
-    else:
-        new_password = args[2]          
-else:
-    argparser.print_help()
-    sys.exit(1)
-    
-errorNodes = set([])
-uid_dict = {}
-session.stop_if_noderange_over(noderange, options.maxnodes)
-
-for rsp in session.read('/noderange/{0}/configuration/management_controller/users/all'.format(noderange)):
-    databynode = rsp["databynode"]
-    for node in databynode:
-        if 'error' in rsp['databynode'][node]:
-            print(node, ':', rsp['databynode'][node]['error'])
-            errorNodes.add(node)
-            continue
-        for user in  rsp['databynode'][node]['users']:
-            if user['username'] == username:
-                if not user['uid'] in uid_dict:
-                    uid_dict[user['uid']] = node
-                    continue
-                uid_dict[user['uid']] = uid_dict[user['uid']] + ',{}'.format(node)
-                break
-
-if not uid_dict:
-    print("Error: Could not reach target node's bmc user")
-    sys.exit(1)
-
-for uid in uid_dict:     
-    success = session.simple_noderange_command(uid_dict[uid], 'configuration/management_controller/users/{0}'.format(uid), new_password, key='password', errnodes=errorNodes)   # = 0 if successful
-
-allNodes = set([])
-
-for node in session.read('/noderange/{0}/nodes/'.format(noderange)):
-    if 'error' in node and success != 0:
-        sys.exit(success)
-    allNodes.add(node['item']['href'].replace("/", ""))
-
-goodNodes = allNodes - errorNodes
-
-for node in goodNodes:
-    print(node + ": Password Change Successful")
-
-
-sys.exit(success)

confluent_client/bin/nodeconfig

@@ -90,12 +90,6 @@ cfgpaths = {
     'bmc.ipv4_gateway': (
         'configuration/management_controller/net_interfaces/management',
         'ipv4_gateway'),
-    'bmc.static_ipv6_addresses': (
-        'configuration/management_controller/net_interfaces/management',
-        'static_v6_addresses'),
-    'bmc.static_ipv6_gateway': (
-        'configuration/management_controller/net_interfaces/management',
-        'static_v6_gateway'),
     'bmc.hostname': (
         'configuration/management_controller/hostname', 'hostname'),
 }
@@ -295,22 +289,19 @@ else:
     for path in queryparms:
         if options.comparedefault:
             continue
-        rcode |= client.print_attrib_path(path, session, list(queryparms[path]),
+        rc = client.print_attrib_path(path, session, list(queryparms[path]),
                                       NullOpt(), queryparms[path])
+        if rc:
+            sys.exit(rc)
     if printsys == 'all' or printextbmc or printbmc or printallbmc:
         if printbmc or not printextbmc:
-         rcode |= client.print_attrib_path(
+         rcode = client.print_attrib_path(
                         '/noderange/{0}/configuration/management_controller/extended/all'.format(noderange),
                         session, printbmc, options, attrprefix='bmc.')
         if options.extra:
-            if options.advanced:
-                   rcode |= client.print_attrib_path(
-                        '/noderange/{0}/configuration/management_controller/extended/extra_advanced'.format(noderange),
-                        session, printextbmc, options)
-            else:
-                rcode |= client.print_attrib_path(
-                        '/noderange/{0}/configuration/management_controller/extended/extra'.format(noderange),
-                        session, printextbmc, options)
+            rcode |= client.print_attrib_path(
+                    '/noderange/{0}/configuration/management_controller/extended/extra'.format(noderange),
+                    session, printextbmc, options)
     if printsys or options.exclude:
         if printsys == 'all':
             printsys = []

confluent_client/bin/nodeconsole

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

confluent_client/bin/nodedeploy

@@ -49,7 +49,7 @@ def armonce(nr, cli):
 
 
 def setpending(nr, profile, cli):
-    args = {'deployment.pendingprofile': profile, 'deployment.state': '', 'deployment.state_detail': ''}
+    args = {'deployment.pendingprofile': profile}
     if not profile.startswith('genesis-'):
         args['deployment.stagedprofile'] = ''
         args['deployment.profile'] = ''
@@ -81,21 +81,10 @@ def main(args):
     if not args.profile and args.network:
         sys.stderr.write('Both noderange and a profile name are required arguments to request a network deployment\n')
         return 1
-    if args.clear and args.profile:
-        sys.stderr.write(
-            'The -c/--clear option should not be used with a profile, '
-            'it is a request to not deploy any profile, and will clear '
-            'whatever the current profile is without being specified\n')
-        return 1
     if extra:
         sys.stderr.write('Unrecognized arguments: ' + repr(extra) + '\n')
     c = client.Command()
     c.stop_if_noderange_over(args.noderange, args.maxnodes)
-    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 args.clear:
         cleararm(args.noderange, c)
         clearpending(args.noderange, c)
@@ -115,7 +104,7 @@ def main(args):
                 for profname in profnames:
                     sys.stderr.write('    ' + profname + '\n')
             else:
-                sys.stderr.write('No deployment profiles available, try osdeploy import or imgutil capture\n')
+                sys.stderr.write('No deployment profiles available, try osdeploy fiimport or imgutil capture\n')
             sys.exit(1)
         armonce(args.noderange, c)
         setpending(args.noderange, args.profile, c)
@@ -127,7 +116,7 @@ def main(args):
                 if node not in databynode:
                     databynode[node] = {}
                 for attr in dbn[node]:
-                    if attr in ('deployment.pendingprofile', 'deployment.apiarmed', 'deployment.stagedprofile', 'deployment.profile', 'deployment.state', 'deployment.state_detail'):
+                    if attr in ('deployment.pendingprofile', 'deployment.apiarmed', 'deployment.stagedprofile', 'deployment.profile'):
                         databynode[node][attr] = dbn[node][attr].get('value', '')
         for node in sortutil.natural_sort(databynode):
             profile = databynode[node].get('deployment.pendingprofile', '')
@@ -148,20 +137,10 @@ def main(args):
                 armed = ' (node authentication armed)'
             else:
                 armed = ''
-            stateinfo = ''
-            deploymentstate = databynode[node].get('deployment.state', '')
-            if deploymentstate:
-                statedetails = databynode[node].get('deployment.state_detail', '')
-                if statedetails:
-                    stateinfo = '{}: {}'.format(deploymentstate, statedetails)
-                else:
-                    stateinfo = deploymentstate
-            if stateinfo:
-                print('{0}: {1} ({2})'.format(node, profile, stateinfo))
-            else:
-                print('{0}: {1}{2}'.format(node, profile, armed))
+            print('{0}: {1}{2}'.format(node, profile, armed))
         sys.exit(0)
-    if not args.clear and args.network and not args.prepareonly:
+    errnodes = set([])
+    if args.network and not args.prepareonly:
         rc = c.simple_noderange_command(args.noderange, '/boot/nextdevice', 'network',
                                         bootmode='uefi',
                                         persistent=False,
@@ -172,6 +151,7 @@ def main(args):
                     ','.join(errnodes)))
             return 1
         rc |= c.simple_noderange_command(args.noderange, '/power/state', 'boot')
+        return rc
     return 0
 
 if __name__ == '__main__':

confluent_client/bin/nodediscover

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

confluent_client/bin/nodeeventlog

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

confluent_client/bin/nodegroupattrib

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

confluent_client/bin/nodeinventory

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

confluent_client/bin/nodelist

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

confluent_client/bin/nodeping

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

confluent_client/bin/nodepower

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

confluent_client/bin/nodersync

@@ -46,10 +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('-s', '--substitutename',
-                         help='Use a different name other than the nodename for rsync')
     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
@@ -65,20 +61,7 @@ def run():
     c = client.Command()
     cmdstr = ' '.join(args[:-1])
     cmdstr = 'rsync -av --info=progress2 ' + cmdstr
-    
-    targname = options.substitutename
-    if targname and '{' in targname:
-        targname =  targname + ':'
-    elif targname:
-        targname = '{node}' + targname + ':'
-    else:
-        targname = '{node}:'
-
-    if options.loginname:
-        cmdstr += ' {}@'.format(options.loginname) + targname + targpath
-    else:
-        cmdstr += ' {}'.format(targname) + targpath
-    
+    cmdstr += ' {node}:' + targpath
 
     currprocs = 0
     all = set([])

confluent_client/bin/noderun

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

confluent_client/bin/nodesensors

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

confluent_client/bin/nodeshell

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

confluent_client/bin/stats

@@ -16,10 +16,13 @@
 # limitations under the License.
 
 import argparse
-import base64
 import csv
+import fcntl
 import io
 import numpy as np
+
+import os
+import subprocess
 import sys
 
 try:
@@ -32,31 +35,7 @@ except ImportError:
     pass
 
 
-def iterm_draw(data):
-    databuf = data.getbuffer()
-    datalen = len(databuf)
-    data = base64.b64encode(databuf).decode('utf8')
-    sys.stdout.write(
-        '\x1b]1337;File=inline=1;size={}:'.format(datalen))
-    sys.stdout.write(data)
-    sys.stdout.write('\a')
-    sys.stdout.write('\n')
-    sys.stdout.flush()
-
-
-def kitty_draw(data):
-    data = base64.b64encode(data.getbuffer())
-    while data:
-        chunk, data = data[:4096], data[4096:]
-        m = 1 if data else 0
-        sys.stdout.write('\x1b_Ga=T,f=100,m={};'.format(m))
-        sys.stdout.write(chunk.decode('utf8'))
-        sys.stdout.write('\x1b\\')
-        sys.stdout.flush()
-    sys.stdout.write('\n')
-
-
-def plot(gui, output, plotdata, bins, fmt):
+def plot(gui, output, plotdata, bins):
     import matplotlib as mpl
     if gui and mpl.get_backend() == 'agg':
         sys.stderr.write('Error: No GUI backend available and -g specified!\n')
@@ -72,13 +51,8 @@ def plot(gui, output, plotdata, bins, fmt):
             tdata = io.BytesIO()
         plt.savefig(tdata)
     if not gui and not output:
-        if fmt == 'sixel':
-            writer = DumbWriter()
-            writer.draw(tdata)
-        elif fmt == 'kitty':
-            kitty_draw(tdata)
-        elif fmt == 'iterm':
-            iterm_draw(tdata)
+        writer = DumbWriter()
+        writer.draw(tdata)
     return n, bins
 
 def textplot(plotdata, bins):
@@ -107,8 +81,7 @@ histogram = False
 aparser = argparse.ArgumentParser(description='Quick access to common statistics')
 aparser.add_argument('-c', type=int, default=0, help='Column number to analyze (default is last column)')
 aparser.add_argument('-d', default=None, help='Value used to separate columns')
-aparser.add_argument('-x', default=False, action='store_true', help='Output histogram in graphical format')
-aparser.add_argument('-f', default='sixel', help='Format for histogram output (sixel/iterm/kitty)')
+aparser.add_argument('-x', default=False, action='store_true', help='Output histogram in sixel format')
 aparser.add_argument('-s', default=0, help='Number of header lines to skip before processing')
 aparser.add_argument('-g', default=False, action='store_true', help='Open histogram in separate graphical window')
 aparser.add_argument('-o', default=None, help='Output histogram to the specified filename in PNG format')
@@ -165,7 +138,7 @@ while data:
     data = list(csv.reader([data], delimiter=delimiter))[0]
 n = None
 if args.g or args.o or args.x:
-    n, bins = plot(args.g, args.o, plotdata, bins=args.b, fmt=args.f)
+    n, bins = plot(args.g, args.o, plotdata, bins=args.b)
 if args.t:
     n, bins = textplot(plotdata, bins=args.b)
 print('Samples: {5} Min: {3} Median: {0} Mean: {1} Max: {4} StandardDeviation: {2} Sum: {6}'.format(np.median(plotdata), np.mean(plotdata), np.std(plotdata), np.min(plotdata), np.max(plotdata), len(plotdata), np.sum(plotdata)))

confluent_client/confluent/client.py

@@ -208,7 +208,7 @@ class Command(object):
     def add_precede_dict(self, dict):
         self._prevdict = dict
 
-    def handle_results(self, ikey, rc, res, errnodes=None, outhandler=None):
+    def handle_results(self, ikey, rc, res, errnodes=None):
         if 'error' in res:
             if errnodes is not None:
                 errnodes.add(self._currnoderange)
@@ -245,12 +245,10 @@ class Command(object):
                         node, val, self._prevdict[node]))
                 else:
                     cprint('{0}: {1}'.format(node, val))
-            elif outhandler:
-                outhandler(node, res)
         return rc
 
     def simple_noderange_command(self, noderange, resource, input=None,
-                                 key=None, errnodes=None, promptover=None, outhandler=None, **kwargs):
+                                 key=None, errnodes=None, promptover=None, **kwargs):
         try:
             self._currnoderange = noderange
             rc = 0
@@ -264,13 +262,13 @@ class Command(object):
             if input is None:
                 for res in self.read('/noderange/{0}/{1}'.format(
                         noderange, resource)):
-                    rc = self.handle_results(ikey, rc, res, errnodes, outhandler)
+                    rc = self.handle_results(ikey, rc, res, errnodes)
             else:
                 self.stop_if_noderange_over(noderange, promptover)
                 kwargs[ikey] = input
                 for res in self.update('/noderange/{0}/{1}'.format(
                         noderange, resource), kwargs):
-                    rc = self.handle_results(ikey, rc, res, errnodes, outhandler)
+                    rc = self.handle_results(ikey, rc, res, errnodes)
             self._currnoderange = None
             return rc
         except KeyboardInterrupt:
@@ -595,7 +593,7 @@ def print_attrib_path(path, session, requestargs, options, rename=None, attrpref
                 else:
                     printmissing.add(attr)
         for missing in printmissing:
-            sys.stderr.write('Error: {0} not a valid attribute\n'.format(missing))
+            sys.stderr.write('Error: {0} not a valid attribute\n'.format(attr))
     return exitcode
 
 
@@ -668,9 +666,6 @@ def updateattrib(session, updateargs, nodetype, noderange, options, dictassign=N
         for attrib in updateargs[1:]:
             keydata[attrib] = None
         for res in session.update(targpath, keydata):
-            for node in res.get('databynode', {}):
-                for warnmsg in res['databynode'][node].get('_warnings', []):
-                    sys.stderr.write('Warning: ' + warnmsg + '\n')
             if 'error' in res:
                 if 'errorcode' in res:
                     exitcode = res['errorcode']
@@ -705,14 +700,6 @@ def updateattrib(session, updateargs, nodetype, noderange, options, dictassign=N
                     noderange, 'attributes/all', dictassign[key], key)
     else:
         if "=" in updateargs[1]:
-            update_ready = True
-            for arg in updateargs[1:]:
-                if not '=' in arg:
-                    update_ready = False
-                    exitcode = 1
-            if not update_ready:
-                sys.stderr.write('Error: {0} Can not set and read at the same time!\n'.format(str(updateargs[1:])))
-                sys.exit(exitcode)
             try:
                 for val in updateargs[1:]:
                     val = val.split('=', 1)

confluent_client/confluent/logreader.py

@@ -1,342 +0,0 @@
-#!/usr/bin/python3
-import collections
-import os
-import struct
-import sys
-import time
-import fcntl
-import select
-import termios
-import tty
-
-def writeout(data):
-    if isinstance(data, str) and not isinstance(data, bytes):
-        data = data.encode('utf8')
-    try:
-        if hasattr(sys.stdout, 'buffer'):
-            sys.stdout.buffer.write(data)
-        else:
-            sys.stdout.write(data)
-    except IOError:
-        time.sleep(0.1)
-        pass
-
-
-class LogReplay(object):
-    def __init__(self, logfile, cblfile):
-        self.bin = open(cblfile, 'rb')
-        self.txt = open(logfile, 'rb')
-        self.cleardata = []
-        self.clearidx = 0
-        self.pendingdata = collections.deque([])
-        self.priordata = collections.deque([])
-        self.laststamp = None
-        self.needclear = False
-        self.lasttxt = ''
-
-    def _rewind(self, datasize=None):
-        curroffset = self.bin.tell() - 16
-        if self.cleardata and self.clearidx > 1:
-            self.clearidx -= 1
-            priordata = self.cleardata[self.clearidx - 1]
-            return curroffset, priordata
-        self.cleardata = []
-        self.clearidx = 0
-        newoffset = curroffset - 32
-        if newoffset < 0:  #TODO: Follow a log roll
-            newoffset = 0
-        if datasize:
-            while datasize > 0 and newoffset > 0:
-                self.bin.seek(newoffset)
-                tmprec = self.bin.read(16)
-                newoffset -= 32
-                tmprec = struct.unpack('!BBIHIBBH', tmprec)
-                if tmprec[1] == 2:
-                    datasize -= tmprec[3]
-        if newoffset >= 0:
-            self.bin.seek(newoffset)
-        return curroffset, None
-
-    def debuginfo(self):
-        return '{0}, {1}'.format(self.bin.tell(), self.clearidx)
-
-    def get_output(self, reverse=False):
-        endoffset = None
-        output = b''
-        if reverse:  # Forget the uncommited future, if present
-            output += b'\x1b[2J\x1b[H'
-            endoffset, priordata = self._rewind(4096)
-            if priordata is not None:
-                return priordata, 1
-        elif self.needclear:
-            output += b'\x1b[2J\x1b[H'
-            self.needclear = False
-        if self.cleardata and self.clearidx < len(self.cleardata):
-            datachunk = self.cleardata[self.clearidx]
-            self.clearidx += 1
-            return datachunk, 1
-        self.cleardata = []
-        self.clearidx = 0
-        while (not reverse) or (self.bin.tell() < endoffset):
-            record = self.bin.read(16)
-            if not record:
-                return b'', 0
-            record = struct.unpack('!BBIHIBBH', record)
-            if record[0] > 16:
-                # Unsupported record, skip
-                self.bin.seek(record[0] - 16, 1)
-                continue
-            type = record[1]
-            offset = record[2]
-            size = record[3]
-            evtdata = record[5]
-            auxdata = record[6]
-            if type == 3:
-                #TODO: provide data for status bar
-                continue
-            elif type == 2:
-                self.laststamp = record[4]
-                self.txt.seek(offset)
-                txtout = self.txt.read(size)
-                if reverse and self.bin.tell() < endoffset:
-                    output += txtout
-                    continue
-                self.paginate(txtout)
-                if self.cleardata:
-                    self.clearidx = 0
-                    if not self.cleardata[0]:
-                        self.cleardata = self.cleardata[1:]
-                    if self.cleardata:
-                        if reverse:
-                            output = self.cleardata[-1]
-                            self.clearidx = len(self.cleardata)
-                        else:
-                            output += self.cleardata[0]
-                            self.clearidx = 1
-                else:
-                    output += txtout
-                break
-        if endoffset is not None and endoffset >= 0:
-            self.bin.seek(endoffset)
-        self.lasttxt = output
-        return output, 1
-
-    def paginate(self, txtout):
-        cleardata = [txtout]
-        nextcleardata = []
-        for sep in (b'\x1b[2J', b'\x1b[H\x1b[J'):
-            replacementcleardata = []
-            for txtout in cleardata:
-                nextcleardata = txtout.split(sep)
-                if len(nextcleardata) > 1:
-                    for idx in range(1, len(nextcleardata)):
-                        nextcleardata[idx] = sep + nextcleardata[idx]
-                replacementcleardata.extend(nextcleardata)
-                nextcleardata = []
-            cleardata = replacementcleardata
-        if len(cleardata) > 1:
-            self.cleardata = cleardata
-        return
-
-    def begin(self):
-        self.needclear = True
-        self.bin.seek(0)
-
-    def end(self):
-        self.bin.seek(0, 2)
-
-    def search(self, searchstr, skipfirst=False):
-        overlap = len(searchstr)
-        firstoffset = self.bin.tell()
-        lastoffset = firstoffset
-        output = self.lasttxt
-        while searchstr not in output:
-            output, delay = self.get_output()
-            if not self.cleardata and lastoffset == self.bin.tell():
-                self.bin.seek(firstoffset)
-                return b'', 0
-            lastoffset = self.bin.tell()
-        if skipfirst:
-            output, delay = self.get_output()
-            while searchstr not in output:
-                output, delay = self.get_output()
-                if not self.cleardata and lastoffset == self.bin.tell():
-                    self.bin.seek(firstoffset)
-                    return b'', 0
-                lastoffset = self.bin.tell()
-        clear = b'\x1b[2J\x1b[H'
-        txtchunks = self.lasttxt.split(searchstr)
-        output = clear + txtchunks[0]
-        txtchunks = txtchunks[1:]
-        while txtchunks:
-            output += b'\x1b[7m' + searchstr + b'\x1b[27m' + txtchunks[0]
-            txtchunks = txtchunks[1:]
-        return output, 0
-
-
-def _replay_to_console(txtfile, binfile):
-    replay = LogReplay(txtfile, binfile)
-    oldtcattr = termios.tcgetattr(sys.stdin.fileno())
-    tty.setraw(sys.stdin.fileno())
-    currfl = fcntl.fcntl(sys.stdin.fileno(), fcntl.F_GETFL)
-    fcntl.fcntl(sys.stdin.fileno(), fcntl.F_SETFL, currfl | os.O_NONBLOCK)
-    reverse = False
-    skipnext = False
-    quitit = False
-    searchstr = None
-    writeout('\x1b[2J\x1b[;H')
-    prepend = ''
-    try:
-        while not quitit:
-            if not skipnext:
-                newdata, delay = replay.get_output(reverse)
-            skipnext = False
-            reverse = False
-            if newdata:
-                if prepend:
-                    newdata = prepend + newdata
-                    prepend = b''
-                writeout(newdata)
-                newdata = ''
-                writeout('\x1b]0;[Time: {0}]\x07'.format(
-                    time.strftime('%m/%d %H:%M:%S', time.localtime(replay.laststamp))))
-                try:
-                    if hasattr(sys.stdout, 'buffer'):
-                        sys.stdout.buffer.flush()
-                    else:
-                        sys.stdout.flush()
-                except IOError:
-                    pass
-            while True:
-                select.select((sys.stdin,), (), (), 86400)
-                myinput = sys.stdin.read()
-                if myinput.startswith('\x1b[C') or myinput.startswith('\x1bOC') or myinput == '\r':  # right
-                    break
-                elif myinput.startswith('\x1b[D') or myinput.startswith('\x1bOD') or myinput == 'y':  # left
-                    writeout('\x1b[2J\x1b[;H')
-                    reverse = True
-                    break
-                elif myinput == 'G' or myinput.startswith('\x1b[F'):
-                    replay.end()
-                    reverse = True
-                    break
-                elif myinput == 'g' or myinput.startswith('\x1b[H'):
-                    replay.begin()
-                    break
-                elif myinput.lower() == 'q' or myinput == '\x03':
-                    quitit = True
-                    break
-                elif myinput.lower() == 'd':
-                    writeout('\x1b];{0}\x07'.format(replay.debuginfo()))
-                    if hasattr(sys.stdout, 'buffer'):
-                        sys.stdout.buffer.flush()
-                    else:
-                        sys.stdout.flush()
-                elif myinput.lower() == '/':
-                    sys.stdout.write('\x1b7\x1b[99999;0H\x1b[2K')
-                    searchstr = ''
-                    nxtchr = '/'
-                    while '\r' not in searchstr:
-                        sys.stdout.write(nxtchr)
-                        sys.stdout.flush()
-                        select.select((sys.stdin,), (), (), 86400)
-                        nxtchr = sys.stdin.read(1)
-                        if nxtchr in ('\x08', '\x7f'):
-                            searchstr = searchstr[:-1]
-                            nxtchr = '\x08 \x08'
-                        else:
-                            searchstr += nxtchr
-                    if not isinstance(searchstr, bytes):
-                        searchstr = searchstr.encode('utf8')
-                    searchstr = searchstr[:-1]
-                    newdata, delay = replay.search(searchstr)
-                    if not newdata:
-                        sys.stdout.write('\x1b[1K\rNo match found')
-                        prepend = b'\x1b[1K\x1b8'
-                    else:
-                        sys.stdout.write('\x1b[1K\x1b8')
-                    sys.stdout.flush()
-                    skipnext = True
-                    break
-                elif myinput.lower() == 'n' and searchstr:
-                    newdata, delay = replay.search(searchstr, True)
-                    if not newdata:
-                        sys.stdout.write('\x1b7\x1b[99999;0H\x1b[2KNo more matches found')
-                        sys.stdout.flush()
-                        prepend = b'\x1b[1K\x1b8'
-                    skipnext = True
-                    break
-                else:
-                    pass # print(repr(myinput))
-    except Exception:
-        currfl = fcntl.fcntl(sys.stdin.fileno(), fcntl.F_GETFL)
-        fcntl.fcntl(sys.stdin.fileno(), fcntl.F_SETFL, currfl ^ os.O_NONBLOCK)
-        termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, oldtcattr)
-        writeout('\x1b[m\x1b[?25h\n')
-        raise
-    currfl = fcntl.fcntl(sys.stdin.fileno(), fcntl.F_GETFL)
-    fcntl.fcntl(sys.stdin.fileno(), fcntl.F_SETFL, currfl ^ os.O_NONBLOCK)
-    termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, oldtcattr)
-    writeout('\x1b[m\x1b[?25h\n')
-
-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.exit(1)
-    _replay_to_console(txtfile, binfile)
-
-def dump_to_console(txtfile):
-    if os.path.exists(txtfile + '.cbl'):
-        binfile = txtfile + '.cbl'
-    elif '.' not in txtfile:
-        if '/' not in txtfile:
-            txtfile = os.getcwd() + '/' + txtfile
-        sys.stderr.write('Unable to locate cbl file: "{0}"\n'.format(txtfile + '.cbl'))
-        sys.exit(1)
-    else:
-        fileparts = txtfile.split('.')
-        prefix = '.'.join(fileparts[:-1])
-        binfile = prefix + '.cbl.' + fileparts[-1]
-        if not os.path.exists(binfile):
-            sys.stderr.write('Unable to locate cbl file: "{0}"\n'.format(binfile))
-            sys.exit(1)
-    replay = LogReplay(txtfile, binfile)
-    quitit = False
-    writeout('\x1b[2J\x1b[;H')
-    prepend = ''
-    try:
-        while not quitit:
-            newdata, delay = replay.get_output(False)
-            if newdata:
-                if prepend:
-                    newdata = prepend + newdata
-                    prepend = b''
-                writeout(newdata.replace(b'\r\n', '\r\n[ {0} ] '.format(time.strftime('%m/%d %H:%M:%S', time.localtime(replay.laststamp))).encode('utf8')))
-                newdata = ''
-                try:
-                    if hasattr(sys.stdout, 'buffer'):
-                        sys.stdout.buffer.flush()
-                    else:
-                        sys.stdout.flush()
-                except IOError:
-                    pass
-            else:
-                break
-    except Exception:
-        writeout('\x1b[m\x1b[?25h\n')
-        raise
-    writeout('\x1b[m\x1b[?25h\n')
-
-if __name__ == '__main__':
-    replay_to_console(sys.argv[1])

confluent_client/confluent/screensqueeze.py

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

confluent_client/confluent/termhandler.py

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

confluent_client/confluent/textgroup.py

@@ -98,24 +98,17 @@ class GroupedData(object):
         self.byoutput = {}
         self.header = {}
         self.client = confluentconnection
-        self.detectedpad = None
 
     def generate_byoutput(self):
         self.byoutput = {}
-        thepad = self.detectedpad if self.detectedpad else ''
         for n in self.bynode:
-            output = ''
-            for ln in self.bynode[n]:
-                output += ln.replace(thepad, '', 1) + '\n'
+            output = '\n'.join(self.bynode[n])
             if output not in self.byoutput:
                 self.byoutput[output] = set([n])
             else:
                 self.byoutput[output].add(n)
 
     def add_line(self, node, line):
-        wspc = re.search(r'^\s*', line).group()
-        if self.detectedpad is None or len(wspc) < len(self.detectedpad):
-            self.detectedpad = wspc
         if node not in self.bynode:
             self.bynode[node] = [line]
         else:
@@ -226,4 +219,4 @@ if __name__ == '__main__':
         if not line:
             continue
         groupoutput.add_line(*line.split(': ', 1))
-    groupoutput.print_deviants()
+    groupoutput.print_deviants()

confluent_client/confluent/tlvdata.py

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

confluent_client/confluent_client.spec.tmpl

@@ -1,23 +1,19 @@
 %define name confluent_client
 %define version #VERSION#
-%define fversion %{lua:
-sv, _ = string.gsub("#VERSION#", "[~+]", "-")
-print(sv)
-}
 %define release 1
 
 Summary: Client libraries and utilities for confluent
 Name: %{name}
 Version: %{version}
 Release: %{release}
-Source0: %{name}-%{fversion}.tar.gz
+Source0: %{name}-%{version}.tar.gz
 License: Apache2
 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
@@ -25,20 +21,28 @@ This package enables python development and command line access to
 a confluent server.
 
 %prep
-%setup -n %{name}-%{fversion}
+%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
 
 
@@ -46,7 +50,4 @@ python3 setup.py install --single-version-externally-managed -O1 --root=$RPM_BUI
 rm -rf $RPM_BUILD_ROOT
 
 %files -f INSTALLED_FILES
-%license /opt/confluent/share/licenses/confluent_client/LICENSE
-%license /opt/confluent/share/licenses/confluent_client/COPYRIGHT
 %defattr(-,root,root)
-/opt/confluent

confluent_client/confluent_env.sh

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

confluent_client/doc/man/confluent2hosts.ronn

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

confluent_client/doc/man/l2traceroute.ronn

@@ -1,38 +0,0 @@
-l2traceroute(8) -- returns the layer 2 route through an Ethernet network managed by confluent given 2 end points.
-==============================
-## SYNOPSIS
-`l2traceroute [options] <start_node> <end_noderange>`  
-
-## DESCRIPTION  
-**l2traceroute** is a command that returns the layer 2 route for the configered interfaces in nodeattrib.
-It can also be used with the -i and -e options to check against specific interfaces on the endpoints. 
-
-
-## PREREQUISITES
-**l2traceroute** the net.<interface>.switch attributes have to be set on the end points if endpoint is not a switch
-
-
-## OPTIONS
-* ` -e` EFACE, --eface=INTERFACE
-   interface to check against for the second end point 
-* ` -i` INTERFACE, --interface=INTERFACE
-   interface to check against for the first end point  
-* ` -c` CUMULUS, --cumulus=CUMULUS
-   return layer 2 route through cumulus switches only 
-* `-h`, `--help`:  
-  Show help message and exit      
-
-   
-## EXAMPLES
- * Checking route between two nodes:  
-  `# l2traceroute_client n244 n1851`  
-  `n244 to n1851: ['switch114']`    
-    
-* Checking route from one node to multiple nodes:  
-  `# l2traceroute_client n244 n1833,n1851`    
-  `n244 to n1833: ['switch114', 'switch7', 'switch32', 'switch253', 'switch85', 'switch72', 'switch21', 'switch2', 'switch96', 'switch103', 'switch115']
-   n244 to n1851: ['switch114']`  
-
-
- 
-

confluent_client/doc/man/nodeapply.ronn

@@ -1,30 +0,0 @@
-nodeapply(8) -- Execute command on many nodes in a noderange through ssh
-=========================================================================
-
-## SYNOPSIS
-
-`nodeapply [options] <noderange>`
-
-## DESCRIPTION
-
-Provides shortcut access to a number of common operations against deployed
-nodes.  These operations include refreshing ssh certificates and configuration,
-rerunning syncflies, and executing specified postscripts.
-
-## OPTIONS
-  
-* `-k`, `--security`
-  Refresh SSH configuration (hosts.equiv and node SSH certificates)
-  
-* `-F`, `--sync`
-  Rerun syncfiles from deployed profile
-  
-* `-P SCRIPTS`, `--scripts=SCRIPTS`
-  Re-run specified scripts, with full path under scripts specified, e.g. post.d/scriptname,firstboot.d/otherscriptname
- 
-* `-c COUNT`, `-f COUNT`, `--count=COUNT`
-  Specify the maximum number of instances to run concurrently
-
-* `-m MAXNODES`, `--maxnodes=MAXNODES`
-  Specify a maximum number of nodes to run remote ssh command to, prompting
-  if over the threshold

confluent_client/doc/man/nodeattrib.ronn.tmpl

@@ -7,8 +7,7 @@ nodeattrib(8) -- List or change confluent nodes attributes
 `nodeattrib <noderange> [<nodeattribute1=value1> <nodeattribute2=value2> ...]`  
 `nodeattrib -c <noderange> <nodeattribute1> <nodeattribute2> ...`  
 `nodeattrib -e <noderange> <nodeattribute1> <nodeattribute2> ...`  
-`nodeattrib -p <noderange> <nodeattribute1> <nodeattribute2> ...`
-`nodeattrib <noderange> -s <attributes.batch> ...` 
+`nodeattrib -p <noderange> <nodeattribute1> <nodeattribute2> ...`  
 
 ## DESCRIPTION
 
@@ -54,18 +53,12 @@ to a blank value will allow masking a group defined attribute with an empty valu
 * `-e`, `--environment`:
   Set specified attributes based on exported environment variable of matching name. 
   Environment variable names may be lower case or all upper case. 
-  Replace . with _ as needed (e.g. info.note may be specified as either $info_note or $INFO_NOTE)
+  Replace . with _ as needed (e.g. info.note may be specified as either $info_note or $INFO_NOTE
   
 * `-p`, `--prompt`:
   Request interactive prompting to provide values rather than the command line
   or environment variables.
-
-* `-s`, `--set`:
-  Set attributes using a batch file rather than the command line. The attributes in the batch file 
-  can be specified as one line of key=value pairs simmilar to command line or each attribute can
-  be in its own line. Lines that start with # sign will be read as a comment. See EXAMPLES for batch
-  file syntax.   
- 
+  
 * `-m MAXNODES`, `--maxnodes=MAXNODES`:
   Prompt if trying to set attributes on more than
   specified number of nodes.
@@ -90,12 +83,12 @@ to a blank value will allow masking a group defined attribute with an empty valu
     `# nodeattrib n1,n2 hardwaremanagement --blame`  
     `n1: hardwaremanagement.manager: 172.30.3.1`  
     `n1: hardwaremanagement.method: ipmi (inherited from group everything)`  
-    `n1: net.switch: r8e1`  
-    `n1: net.switchport: 14`  
+    `n1: hardwaremanagement.switch: r8e1`  
+    `n1: hardwaremanagement.switchport: 14`  
     `n2: hardwaremanagement.manager: 172.30.3.2`  
     `n2: hardwaremanagement.method: ipmi (inherited from group everything)`  
-    `n2: net.switch: r8e1`  
-    `n2: net.switchport: 2`  
+    `n2: hardwaremanagement.switch: r8e1`  
+    `n2: hardwaremanagement.switchport: 2`  
 
 * Listing matching nodes of a simple noderange that are set:
     `# nodeattrib n1-n2 current`  
@@ -123,25 +116,6 @@ to a blank value will allow masking a group defined attribute with an empty valu
     `d1: net.pxe.switch: pxeswitch1`  
     `d1: net.switch:`  
 
-* Setting attributes using a batch file with syntax similar to command line:
-    `# cat nodeattributes.batch`  
-    `# power`
-    `power.psu1.outlet=3 power.psu1.pdu=pdu2`
-    `# nodeattrib n41 -s nodeattributes.batch`
-    `n41: 3`
-    `n41: pdu2`
-
-* Setting attributes using a batch file with syntax where each attribute is in its own line:
-    `# cat nodeattributes.batch`  
-    `# management`
-    `custom.mgt.switch=switch_main`
-    `custom.mgt.switch.port=swp4`
-    `# nodeattrib n41 -s nodeattributes.batch`
-    `n41: switch_main`
-    `n41: swp4`
-
-  
-
 ## SEE ALSO
 
 nodegroupattrib(8), nodeattribexpressions(5)

confluent_client/doc/man/nodebmcpassword.ronn

@@ -1,28 +0,0 @@
-nodebmcpassword(8) -- Change management controller password for a specified user
-=========================================================
-
-## SYNOPSIS
-
-`nodebmcpassword <noderange> <username> <new_password>`  
-
-## DESCRIPTION
-
-`nodebmcpassword` allows you to change the management controller password for a user on a specified noderange
-
-## OPTIONS
-
-* `-m MAXNODES`, `--maxnodes=MAXNODES`:
-  Number of nodes to affect before prompting for
-  confirmation
-  
-* `-h`, `--help`:
-  Show help message and exit  
-
-## EXAMPLES:
-
-* Reset the management controller for nodes n1 through n4:
-  `# nodebmcreset n1-n4`  
-  `n1: Password Change Successful`  
-  `n2: Password Change Successful`  
-  `n3: Password Change Successful`  
-  `n4: Password Change Successful`  

confluent_client/doc/man/nodeconsole.ronn

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

confluent_client/doc/man/nodediscover.ronn

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

confluent_client/doc/man/nodeeventlog.ronn

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

confluent_client/doc/man/nodelist.ronn

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

confluent_client/doc/man/nodeping.ronn

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

confluent_client/doc/man/nodepower.ronn

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

confluent_client/doc/man/nodersync.ronn

@@ -16,9 +16,6 @@ noderange. This will present progress as percentage for all nodes.
   Specify how many rsync executions to do concurrently.  If noderange
   exceeds the count, then excess nodes will wait until one of the
   active count completes. 
-
-* `-s`, `--substitutename`:
-  'Use a different name other than the nodename for rsync'
   
 * `-m MAXNODES`, `--maxnodes=MAXNODES`:
   Specify a maximum number of nodes to run rsync to, prompting if over the

confluent_client/doc/man/osdeploy.ronn

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

confluent_client/setup.py.tmpl

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

confluent_osdeploy/buildrpm

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

confluent_osdeploy/buildrpm-aarch64

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

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

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

confluent_osdeploy/common/profile/scripts/confignet

@@ -8,10 +8,6 @@ import sys
 import time
 import shlex
 import subprocess
-try:
-    import yaml
-except ImportError:
-    pass
 try:
     from importlib.machinery import SourceFileLoader
     def load_source(mod, path):
@@ -29,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
@@ -86,7 +80,7 @@ def map_idx_to_name():
     for line in subprocess.check_output(['ip', 'l']).decode('utf8').splitlines():
         if line.startswith(' ') and 'link/' in line:
             typ = line.split()[0].split('/')[1]
-            devtype[prevdev] = typ if typ != 'ether' else 'ethernet'
+            devtype[prevdev] = typ if type != 'ether' else 'ethernet'
         if line.startswith(' '):
             continue
         idx, iface, rst = line.split(':', 2)
@@ -111,106 +105,6 @@ def get_interface_name(iname, settings):
         return iname
     return None
 
-class NetplanManager(object):
-    def __init__(self, deploycfg):
-        self.cfgbydev = {}
-        self.read_connections()
-        self.deploycfg = deploycfg
-
-    def read_connections(self):
-        for plan in glob.glob('/etc/netplan/*.y*ml'):
-            with open(plan) as planfile:
-                planinfo = yaml.safe_load(planfile)
-                if not planinfo:
-                    continue
-            nicinfo = planinfo.get('network', {}).get('ethernets', {})
-            for devname in nicinfo:
-                if devname == 'lo':
-                    continue
-                if 'gateway4' in nicinfo[devname]:
-                    # normalize deprecated syntax on read in
-                    gw4 = nicinfo[devname]['gateway4']
-                    del nicinfo[devname]['gateway4']
-                    routeinfo = nicinfo[devname].get('routes', [])
-                    for ri in routeinfo:
-                        if ri.get('via', None) == gw4 and ri.get('to', None) in ('default', '0.0.0.0/0', '0/0'):
-                            break
-                    else:
-                        routeinfo.append({
-                            'to': 'default',
-                            'via': gw4
-                        })
-                    nicinfo[devname]['routes'] = routeinfo
-                self.cfgbydev[devname] = nicinfo[devname]
-    
-    def apply_configuration(self, cfg):
-        devnames = cfg['interfaces']
-        if len(devnames) != 1:
-            raise Exception('Multi-nic team/bonds not yet supported')
-        stgs = cfg['settings']
-        needcfgapply = False
-        for devname in devnames:
-            needcfgwrite = False
-            # ipv6_method missing at uconn...
-            if stgs.get('ipv6_method', None) == 'static':
-                curraddr = stgs['ipv6_address']
-                currips = self.getcfgarrpath([devname, 'addresses'])
-                if curraddr not in currips:
-                    needcfgwrite = True
-                    currips.append(curraddr)
-            if stgs.get('ipv4_method', None) == 'static':
-                curraddr = stgs['ipv4_address']
-                currips = self.getcfgarrpath([devname, 'addresses'])
-                if curraddr not in currips:
-                    needcfgwrite = True
-                    currips.append(curraddr)
-            gws = []
-            gws.append(stgs.get('ipv4_gateway', None))
-            gws.append(stgs.get('ipv6_gateway', None))
-            for gwaddr in gws:
-                if gwaddr:
-                    cfgroutes = self.getcfgarrpath([devname, 'routes'])
-                    for rinfo in cfgroutes:
-                        if rinfo.get('via', None) == gwaddr:
-                            break
-                    else:
-                        needcfgwrite = True
-                        cfgroutes.append({'via': gwaddr, 'to': 'default'})
-            dnsips = self.deploycfg.get('nameservers', [])
-            dnsdomain = self.deploycfg.get('dnsdomain', '')
-            if dnsips:
-                currdnsips = self.getcfgarrpath([devname, 'nameservers', 'addresses'])
-                for dnsip in dnsips:
-                    if dnsip and dnsip not in currdnsips:
-                        needcfgwrite = True
-                        currdnsips.append(dnsip)
-            if dnsdomain:
-                currdnsdomain = self.getcfgarrpath([devname, 'nameservers', 'search'])
-                if dnsdomain not in currdnsdomain:
-                    needcfgwrite = True
-                    currdnsdomain.append(dnsdomain)
-            if needcfgwrite:
-                needcfgapply = True
-                newcfg = {'network': {'version': 2, 'ethernets': {devname: self.cfgbydev[devname]}}}
-                oumask = os.umask(0o77)
-                with open('/etc/netplan/{0}-confluentcfg.yaml'.format(devname), 'w') as planout:
-                    planout.write(yaml.dump(newcfg))
-                os.umask(oumask)
-        if needcfgapply:
-            subprocess.call(['netplan', 'apply'])
-
-    def getcfgarrpath(self, devpath):
-        currptr = self.cfgbydev
-        for k in devpath[:-1]:
-            if k not in currptr:
-                currptr[k] = {}
-            currptr = currptr[k]
-        if devpath[-1] not in currptr:
-            currptr[devpath[-1]] = []
-        return currptr[devpath[-1]]
-        
-
-
 class WickedManager(object):
     def __init__(self):
         self.teamidx = 0
@@ -260,14 +154,12 @@ class WickedManager(object):
                 sys.stderr.write("Warning, multiple interfaces ({0}) without a team_mode, skipping setup\n".format(','.join(cfg['interfaces'])))
                 return
             if not stgs.get('connection_name', None):
-                stgs['connection_name'] = 'bond{0}'.format(self.teamidx)
+                stgs['connection_name'] = 'team{0}'.format(self.teamidx)
                 self.teamidx += 1
             cname = stgs['connection_name']
             with open('/etc/sysconfig/network/ifcfg-{0}'.format(cname), 'w') as teamout:
                 teamout.write(ipcfg)
-                if stgs['team_mode'] == 'lacp':
-                    stgs['team_mode'] = '802.3ad'
-                teamout.write("BONDING_MODULE_OPTS='mode={0} miimon=100'\nBONDING_MASTER=yes\n".format(stgs['team_mode']))
+                teamout.write('TEAM_RUNNER={0}\n'.format(stgs['team_mode']))
                 idx = 1
                 for iface in cfg['interfaces']:
                     subprocess.call(['wicked', 'ifdown', iface])
@@ -276,7 +168,7 @@ class WickedManager(object):
                         os.remove('/etc/sysconfig/network/ifroute-{0}'.format(iface))
                     except OSError:
                         pass
-                    teamout.write('BONDING_SLAVE{0}={1}\n'.format(idx, iface))
+                    teamout.write('TEAM_PORT_DEVICE_{0}={1}\n'.format(idx, iface))
                     idx += 1
         else:
             cname = list(cfg['interfaces'])[0]
@@ -297,8 +189,7 @@ class WickedManager(object):
 
 
 class NetworkManager(object):
-    def __init__(self, devtypes, deploycfg):
-        self.deploycfg = deploycfg
+    def __init__(self, devtypes):
         self.connections = {}
         self.uuidbyname = {}
         self.uuidbydev = {}
@@ -348,7 +239,7 @@ class NetworkManager(object):
                     bondcfg[stg] = deats[stg]
         if member in self.uuidbyname:
             subprocess.check_call(['nmcli', 'c', 'del', self.uuidbyname[member]])
-        subprocess.check_call(['nmcli', 'c', 'add', 'type', 'bond-slave', 'master', team, 'con-name', member, 'connection.interface-name', member])
+        subprocess.check_call(['nmcli', 'c', 'add', 'type', 'team-slave', 'master', team, 'con-name', member, 'connection.interface-name', member])
         if bondcfg:
             args = []
             for parm in bondcfg:
@@ -358,7 +249,6 @@ class NetworkManager(object):
 
     def apply_configuration(self, cfg):
         cmdargs = {}
-        cmdargs['connection.autoconnect'] = 'yes'
         stgs = cfg['settings']
         cmdargs['ipv6.method'] = stgs.get('ipv6_method', 'link-local')
         if stgs.get('ipv6_address', None):
@@ -370,20 +260,6 @@ class NetworkManager(object):
             cmdargs['ipv4.gateway'] = stgs['ipv4_gateway']
         if stgs.get('ipv6_gateway', None):
             cmdargs['ipv6.gateway'] = stgs['ipv6_gateway']
-        dnsips = self.deploycfg.get('nameservers', [])
-        if not dnsips:
-            dnsips = []
-        dns4 = []
-        dns6 = []
-        for dnsip in dnsips:
-            if '.' in dnsip:
-                dns4.append(dnsip)
-            elif ':' in dnsip:
-                dns6.append(dnsip)
-        if dns4:
-            cmdargs['ipv4.dns'] = ','.join(dns4)
-        if dns6:
-            cmdargs['ipv6.dns'] = ','.join(dns6)
         if len(cfg['interfaces']) > 1:  # team time.. should be..
             if not cfg['settings'].get('team_mode', None):
                 sys.stderr.write("Warning, multiple interfaces ({0}) without a team_mode, skipping setup\n".format(','.join(cfg['interfaces'])))
@@ -396,49 +272,26 @@ class NetworkManager(object):
             for arg in cmdargs:
                 cargs.append(arg)
                 cargs.append(cmdargs[arg])
-            if stgs['team_mode'] == 'lacp':
-                stgs['team_mode'] = '802.3ad'
-            subprocess.check_call(['nmcli', 'c', 'add', 'type', 'bond', 'con-name', cname, 'connection.interface-name', cname, 'bond.options', 'mode={}'.format(stgs['team_mode'])] + cargs)
+            subprocess.check_call(['nmcli', 'c', 'add', 'type', 'team', 'con-name', cname, 'connection.interface-name', cname, 'team.runner', stgs['team_mode']] + cargs)
             for iface in cfg['interfaces']:
                 self.add_team_member(cname, iface)
             subprocess.check_call(['nmcli', 'c', 'u', cname])
         else:
             cname = stgs.get('connection_name', None)
             iname = list(cfg['interfaces'])[0]
-            ctype = self.devtypes.get(iname, None)
-            if not ctype:
-                sys.stderr.write("Warning, no device found for interface_name ({0}), skipping setup\n".format(iname))
-                return
-            if stgs.get('vlan_id', None):
-                vlan = stgs['vlan_id']
-                if ctype == 'infiniband':
-                    vlan = '0x{0}'.format(vlan) if not vlan.startswith('0x') else vlan
-                    cmdargs['infiniband.parent'] = iname
-                    cmdargs['infiniband.p-key'] = vlan
-                    iname = '{0}.{1}'.format(iname, vlan[2:])
-                elif ctype == 'ethernet':
-                    ctype = 'vlan'
-                    cmdargs['vlan.parent'] = iname
-                    cmdargs['vlan.id'] = vlan
-                    iname = '{0}.{1}'.format(iname, vlan)
-                else:
-                    sys.stderr.write("Warning, unknown interface_name ({0}) device type ({1}) for VLAN/PKEY, skipping setup\n".format(iname, ctype))
-                    return
-            cname = iname if not cname else cname
+            if not cname:
+                cname = iname
             u = self.uuidbyname.get(cname, None)
             cargs = []
             for arg in cmdargs:
                 cargs.append(arg)
                 cargs.append(cmdargs[arg])
             if u:
-                subprocess.check_call(['nmcli', 'c', 'm', u, 'connection.interface-name', iname] + cargs)
+                cmdargs['connection.interface-name'] = iname
+                subprocess.check_call(['nmcli', 'c', 'm', u] + cargs)
                 subprocess.check_call(['nmcli', 'c', 'u', u])
             else:
-                subprocess.check_call(['nmcli', 'c', 'add', 'type', ctype, 'con-name', cname, 'connection.interface-name', iname] + cargs)
-                self.read_connections()
-                u = self.uuidbyname.get(cname, None)
-                if u:
-                    subprocess.check_call(['nmcli', 'c', 'u', u])
+                subprocess.check_call(['nmcli', 'c', 'add', 'type', self.devtypes[iname], 'con-name', cname, 'connection.interface-name', iname] + cargs)
 
 
 
@@ -454,18 +307,8 @@ if __name__ == '__main__':
     myaddrs = apiclient.get_my_addresses()
     srvs, _ = apiclient.scan_confluents()
     doneidxs = set([])
-    dc = None
-    if not srvs:  # the multicast scan failed, fallback to deploycfg cfg file
-        with open('/etc/confluent/confluent.deploycfg', 'r') as dci:
-            for cfgline in dci.read().split('\n'):
-                if cfgline.startswith('deploy_server:'):
-                    srvs = [cfgline.split()[1]]
-                    break
     for srv in srvs:
-        try:
-            s = socket.create_connection((srv, 443))
-        except socket.error:
-            continue
+        s = socket.create_connection((srv, 443))
         myname = s.getsockname()
         s.close()
         if len(myname) == 4:
@@ -478,58 +321,26 @@ if __name__ == '__main__':
                     curridx = addr[-1]
         if curridx in doneidxs:
             continue
-        for tries in (1, 2, 3):
-            try:
-                status, nc = apiclient.HTTPSClient(usejson=True, host=srv).grab_url_with_status('/confluent-api/self/netcfg')
-                break
-            except Exception:
-                if tries == 3:
-                    raise
-                time.sleep(1)
-                continue
+        status, nc = apiclient.HTTPSClient(usejson=True, host=srv).grab_url_with_status('/confluent-api/self/netcfg')
         nc = json.loads(nc)
-        if not dc:
-            for tries in (1, 2, 3):
-                try:
-                    status, dc = apiclient.HTTPSClient(usejson=True, host=srv).grab_url_with_status('/confluent-api/self/deploycfg2')
-                    break
-                except Exception:
-                    if tries == 3:
-                        raise
-                    time.sleep(1)
-                    continue
-            dc = json.loads(dc)
         iname = get_interface_name(idxmap[curridx], nc.get('default', {}))
         if iname:
-            for iname in iname.split(','):
-                if 'default' in netname_to_interfaces:
-                    netname_to_interfaces['default']['interfaces'].add(iname)
-                else:
-                    netname_to_interfaces['default'] = {'interfaces': set([iname]), 'settings': nc['default']}
+            if 'default' in netname_to_interfaces:
+                netname_to_interfaces['default']['interfaces'].add(iname)
+            else:
+                netname_to_interfaces['default'] = {'interfaces': set([iname]), 'settings': nc['default']}
         for netname in nc.get('extranets', {}):
             uname = '_' + netname
             iname = get_interface_name(idxmap[curridx], nc['extranets'][netname])
             if iname:
-                for iname in iname.split(','):
-                    if uname in netname_to_interfaces:
-                        netname_to_interfaces[uname]['interfaces'].add(iname)
-                    else:
-                        netname_to_interfaces[uname] = {'interfaces': set([iname]), 'settings': nc['extranets'][netname]}
+                if uname in netname_to_interfaces:
+                    netname_to_interfaces[uname]['interfaces'].add(iname)
+                else:
+                    netname_to_interfaces[uname] = {'interfaces': set([iname]), 'settings': nc['extranets'][netname]}
         doneidxs.add(curridx)
-    if 'default' in netname_to_interfaces:
-        for netn in netname_to_interfaces:
-            if netn == 'default':
-                continue
-            netname_to_interfaces['default']['interfaces'] -= netname_to_interfaces[netn]['interfaces']
-        if not netname_to_interfaces['default']['interfaces']:
-            del netname_to_interfaces['default']
-    # Make sure VLAN/PKEY connections are created last
-    netname_to_interfaces = dict(sorted(netname_to_interfaces.items(), key=lambda item: 'vlan_id' in item[1]['settings']))
     rm_tmp_llas(tmpllas)
-    if os.path.exists('/usr/sbin/netplan'):
-        nm = NetplanManager(dc)
     if os.path.exists('/usr/bin/nmcli'):
-        nm = NetworkManager(devtypes, dc)
+        nm = NetworkManager(devtypes)
     elif os.path.exists('/usr/sbin/wicked'):
         nm = WickedManager()
     for netn in netname_to_interfaces:

confluent_osdeploy/common/profile/scripts/sample/consoleredirect

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

confluent_osdeploy/common/profile/scripts/setupssh

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

confluent_osdeploy/confluent_osdeploy-aarch64.spec.tmpl

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

confluent_osdeploy/confluent_osdeploy.spec.tmpl

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

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

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

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

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

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

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

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

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

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

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

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

@@ -3,8 +3,6 @@ import os
 
 class DiskInfo(object):
     def __init__(self, devname):
-        if devname.startswith('nvme') and 'c' in devname:
-            raise Exception("Skipping multipath devname")
         self.name = devname
         self.wwn = None
         self.path = None
@@ -56,7 +54,7 @@ class DiskInfo(object):
 
     @property
     def priority(self):
-        if self.model.lower() in ('m.2 nvme 2-bay raid kit', 'thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
+        if self.model.lower() in ('thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
             return 0
         if 'imsm' in self.mdcontainer:
             return 1

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

@@ -11,13 +11,6 @@ import struct
 import sys
 import subprocess
 
-def get_partname(devname, idx):
-    if devname[-1] in '0123456789':
-        return '{}p{}'.format(devname, idx)
-    else:
-        return '{}{}'.format(devname, idx)
-
-
 def get_next_part_meta(img, imgsize):
     if img.tell() == imgsize:
         return None
@@ -60,13 +53,10 @@ class PartedRunner():
     def __init__(self, disk):
         self.disk = disk
 
-    def run(self, command, check=True):
+    def run(self, command):
         command = command.split()
         command = ['parted', '-a', 'optimal', '-s', self.disk] + command
-        if check:
-            return subprocess.check_output(command).decode('utf8')
-        else:
-            return subprocess.run(command, stdout=subprocess.PIPE).stdout.decode('utf8')
+        return subprocess.check_output(command).decode('utf8')
 
 def fixup(rootdir, vols):
     devbymount = {}
@@ -176,8 +166,6 @@ def fixup(rootdir, vols):
             partnum = re.search('(\d+)$', targdev).group(1)
             targblock = re.search('(.*)\d+$', targdev).group(1)
     if targblock:
-        if targblock.endswith('p') and 'nvme' in targblock:
-            targblock = targblock[:-1]
         shimpath = subprocess.check_output(['find', os.path.join(rootdir, 'boot/efi'), '-name', 'shimx64.efi']).decode('utf8').strip()
         shimpath = shimpath.replace(rootdir, '/').replace('/boot/efi', '').replace('//', '/').replace('/', '\\')
         subprocess.check_call(['efibootmgr', '-c', '-d', targblock, '-l', shimpath, '--part', partnum])
@@ -236,8 +224,7 @@ def install_to_disk(imgpath):
         instdisk = diskin.read()
     instdisk = '/dev/' + instdisk
     parted = PartedRunner(instdisk)
-    # do this safer, unit s print might bomb
-    dinfo = parted.run('unit s print', check=False)
+    dinfo = parted.run('unit s print')
     dinfo = dinfo.split('\n')
     sectors = 0
     sectorsize = 0
@@ -271,7 +258,7 @@ def install_to_disk(imgpath):
         if end > sectors:
             end = sectors
         parted.run('mkpart primary {}s {}s'.format(curroffset, end))
-        vol['targetdisk'] = get_partname(instdisk , volidx)
+        vol['targetdisk'] = instdisk + '{0}'.format(volidx)
         curroffset += size + 1
     if not lvmvols:
         if swapsize:
@@ -281,10 +268,10 @@ def install_to_disk(imgpath):
             if end > sectors:
                 end = sectors
             parted.run('mkpart swap {}s {}s'.format(curroffset, end))
-            subprocess.check_call(['mkswap', get_partname(instdisk, volidx + 1)])
+            subprocess.check_call(['mkswap', instdisk + '{}'.format(volidx + 1)])
     else:
         parted.run('mkpart lvm {}s 100%'.format(curroffset))
-        lvmpart = get_partname(instdisk, volidx + 1)
+        lvmpart = instdisk + '{}'.format(volidx + 1)
         subprocess.check_call(['pvcreate', '-ff', '-y', lvmpart])
         subprocess.check_call(['vgcreate', 'localstorage', lvmpart])
         vginfo = subprocess.check_output(['vgdisplay', 'localstorage', '--units', 'b']).decode('utf8')

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

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

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

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

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

@@ -1,5 +1,4 @@
 #!/usr/bin/python
-import time
 import importlib
 import tempfile
 import json
@@ -224,7 +223,6 @@ def synchronize():
         if status == 202:
             lastrsp = ''
             while status != 204:
-                time.sleep(2)
                 status, rsp = ac.grab_url_with_status('/confluent-api/self/remotesyncfiles')
                 if not isinstance(rsp, str):
                     rsp = rsp.decode('utf8')

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

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

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

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

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

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

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

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

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

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

confluent_osdeploy/el7/profiles/default/scripts/functions

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

confluent_osdeploy/el7/profiles/default/scripts/getinstalldisk

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

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

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

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

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

confluent_osdeploy/el7/profiles/default/scripts/syncfileclient

@@ -3,10 +3,9 @@ import importlib
 import tempfile
 import json
 import os
-import shutil
 import pwd
-import time
 import grp
+import shutil
 try:
     from importlib.machinery import SourceFileLoader
     def load_source(mod, path):
@@ -20,7 +19,6 @@ except IOError:
     apiclient = load_source('apiclient', '/etc/confluent/apiclient')
 
 
-
 def partitionhostsline(line):
     comment = ''
     try:
@@ -224,7 +222,6 @@ def synchronize():
         if status == 202:
             lastrsp = ''
             while status != 204:
-                time.sleep(2)
                 status, rsp = ac.grab_url_with_status('/confluent-api/self/remotesyncfiles')
                 if not isinstance(rsp, str):
                     rsp = rsp.decode('utf8')
@@ -274,7 +271,6 @@ def synchronize():
                         os.chown(fname, uid, gid)
     finally:
         shutil.rmtree(tmpdir)
-        shutil.rmtree(appendoncedir)
 
 
 if __name__ == '__main__':

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

@@ -25,7 +25,6 @@ get_remote_apikey() {
         fi
     done
 }
-. /lib/dracut-lib.sh
 root=1
 rootok=1
 netroot=confluent
@@ -95,41 +94,6 @@ cd - > /dev/null
 rm -rf $tpmdir
 touch /etc/confluent/confluent.info
 cd /sys/class/net
-touch /etc/confluent/confluent.info
-confluentsrv=$(getarg confluent)
-DIDDHCP=0
-if [ ! -z "$confluentsrv" ]; then
-    for i in *; do
-        ip link set $i up
-    done
-    if [[ "$confluentsrv" = *":"* ]]; then
-        confluenthttpsrv=[$confluentsrv]
-        /usr/libexec/nm-initrd-generator ip=:dhcp6
-    else
-        confluenthttpsrv=$confluentsrv
-        ifname=$(ip -br link|grep LOWER_UP|grep -v UNKNOWN|head -n 1|awk '{print $1}')
-        echo -n "Attempting to use dhcp to bring up $ifname..."
-        dhclient $ifname
-        while ! ip -br addr show dev $ifname | grep \\. > /dev/null; do
-            echo -n "Still waiting for IPv4 address on: "
-            ip -br link show dev $ifname 
-            sleep 1
-        done
-        echo -n "Complete: "
-        ip -br addr show dev $ifname
-        DIDDHCP=1
-    fi
-    myids=uuid=$(cat /sys/devices/virtual/dmi/id/product_uuid)
-    for mac in $(ip -br link|grep -v LOOPBACK|awk '{print $3}'); do
-        myids=$myids"/mac="$mac
-    done
-    myname=$(curl -sH "CONFLUENT_IDS: $myids" https://$confluenthttpsrv/confluent-api/self/whoami)
-    if [ ! -z "$myname" ]; then
-        echo NODENAME: $myname > /etc/confluent/confluent.info
-        echo MANAGER: $confluentsrv >> /etc/confluent/confluent.info
-        echo EXTMGRINFO: $confluentsrv'||1' >> /etc/confluent/confluent.info
-    fi
-fi
 echo -n "Scanning for network configuration..."
 while ! grep ^EXTMGRINFO: /etc/confluent/confluent.info | awk -F'|' '{print $3}' | grep 1 >& /dev/null && [ "$TRIES" -lt 30 ]; do
     TRIES=$((TRIES + 1))
@@ -155,11 +119,11 @@ fi
 ready=0
 while [ $ready = "0" ]; do
     get_remote_apikey
-    if [[ $confluent_mgr == *:* ]] && [[ $confluent_mgr != "["* ]]; then
+    if [[ $confluent_mgr == *:* ]]; then
         confluent_mgr="[$confluent_mgr]"
     fi
     tmperr=$(mktemp)
-    curl -sSf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" https://$confluent_mgr/confluent-api/self/deploycfg2 > /etc/confluent/confluent.deploycfg 2> $tmperr
+    curl -sSf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" https://$confluent_mgr/confluent-api/self/deploycfg > /etc/confluent/confluent.deploycfg 2> $tmperr
     if grep 401 $tmperr > /dev/null; then
         confluent_apikey=""
         if [ -n "$lasthdl" ]; then
@@ -183,47 +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
-linktype=$(ip link show dev ${ifname}|grep link/|awk '{print $1}')
-if [ "$linktype" = link/infiniband ]; then
-	linktype="infiniband"
-else
-	linktype="ethernet"
-fi
-echo type=$linktype >> /run/NetworkManager/system-connections/$ifname.nmconnection
-
-cat >> /run/NetworkManager/system-connections/$ifname.nmconnection << EOC
-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
-
-EOC
 autoconfigmethod=$(grep ^ipv4_method: /etc/confluent/confluent.deploycfg |awk '{print $2}')
-auto6configmethod=$(grep ^ipv6_method: /etc/confluent/confluent.deploycfg |awk '{print $2}')
 if [ "$autoconfigmethod" = "dhcp" ]; then
-    if [ "$DIDDHCP" = "0" ]; then
-        echo -n "Attempting to use dhcp to bring up $ifname..."
-        dhclient $ifname
-        while ! ip -br addr show dev $ifname | grep \\. > /dev/null; do
-            echo -n "Still waiting for IPv4 address on: "
-            ip -br link show dev $ifname 
-            sleep 1
-        done
-        echo -n "Complete: "
-        ip -br addr show dev $ifname
-    fi
-    confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg| awk '{print $2}')
-elif [ "$autoconfigmethod" = "static" ]; then
-    confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg| awk '{print $2}')
+    echo -n "Attempting to use dhcp to bring up $ifname..."
+    dhclient $ifname
+    echo "Complete:"
+    ip addr show dev $ifname
+else
     v4addr=$(grep ^ipv4_address: /etc/confluent/confluent.deploycfg)
     v4addr=${v4addr#ipv4_address: }
     v4gw=$(grep ^ipv4_gateway: /etc/confluent/confluent.deploycfg)
@@ -237,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
@@ -247,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
@@ -270,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 == *:* ]] && [[ $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
@@ -349,7 +246,8 @@ for addr in $(grep ^MANAGER: /etc/confluent/confluent.info|awk '{print $2}'|sed
         confluent_urls="$confluent_urls $confluent_proto://$addr/confluent-public/os/$confluent_profile/rootimg.sfs"
     fi
 done
+confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg| awk '{print $2}')
 mkdir -p /etc/confluent
-curl -sf https://$confluent_websrv/confluent-public/os/$confluent_profile/scripts/functions > /etc/confluent/functions
+curl -sf https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/functions > /etc/confluent/functions
 . /etc/confluent/functions
 source_remote imageboot.sh

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

@@ -1,54 +0,0 @@
-try:
-    import configparser
-except ImportError:
-    import ConfigParser as configparser
-    import cStringIO
-import imp
-import sys
-apiclient = imp.load_source('apiclient', '/opt/confluent/bin/apiclient')
-repo = None
-server4 = None
-server = None
-server6 = None
-profile = None
-v4cfg = None
-with open('/etc/confluent/confluent.deploycfg') as dplcfgfile:
-    lines = dplcfgfile.read().split('\n')
-    for line in lines:
-        if line.startswith('deploy_server:'):
-           _, server4 = line.split(' ', 1)
-        if line.startswith('deploy_server_v6:'):
-           _, server6 = line.split(' ', 1)
-        if line.startswith('profile: '):
-           _, profile = line.split(' ', 1)
-        if line.startswith('ipv4_method: '):
-           _, v4cfg = line.split(' ', 1)
-if v4cfg == 'static' or v4cfg =='dhcp':
-    server = server4
-if not server:
-    server = '[{}]'.format(server6)
-
-path = '/confluent-public/os/{0}/distribution/'.format(profile)
-clnt = apiclient.HTTPSClient()
-cfgdata = clnt.grab_url(path + '.treeinfo').decode()
-c = configparser.ConfigParser()
-try:
-    c.read_string(cfgdata)
-except AttributeError:
-    f = cStringIO.StringIO(cfgdata)
-    c.readfp(f)
-for sec in c.sections():
-    if sec.startswith('variant-'):
-        try:
-            repopath = c.get(sec, 'repository')
-        except Exception:
-            continue
-        _, varname = sec.split('-', 1)
-        reponame = '/etc/yum.repos.d/local-{0}.repo'.format(varname.lower())
-        with open(reponame, 'w') as repout:
-            repout.write('[local-{0}]\n'.format(varname.lower()))
-            repout.write('name=Local install repository for {0}\n'.format(varname))
-            if repopath[0] == '.':
-                repopath = repopath[1:]
-            repout.write('baseurl=https://{}/confluent-public/os/{}/distribution/{}\n'.format(server, profile, repopath))
-            repout.write('enabled=1\n')

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

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

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

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

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

@@ -3,8 +3,6 @@ import os
 
 class DiskInfo(object):
     def __init__(self, devname):
-        if devname.startswith('nvme') and 'c' in devname:
-            raise Exception("Skipping multipath devname")
         self.name = devname
         self.wwn = None
         self.path = None
@@ -56,7 +54,7 @@ class DiskInfo(object):
 
     @property
     def priority(self):
-        if self.model.lower() in ('m.2 nvme 2-bay raid kit', 'thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
+        if self.model.lower() in ('thinksystem_m.2_vd', 'thinksystem m.2', 'thinksystem_m.2'):
             return 0
         if 'imsm' in self.mdcontainer:
             return 1

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

@@ -10,15 +10,6 @@ import stat
 import struct
 import sys
 import subprocess
-import traceback
-
-bootuuid = None
-
-def get_partname(devname, idx):
-    if devname[-1] in '0123456789':
-        return '{}p{}'.format(devname, idx)
-    else:
-        return '{}{}'.format(devname, idx)
 
 def get_next_part_meta(img, imgsize):
     if img.tell() == imgsize:
@@ -62,13 +53,10 @@ class PartedRunner():
     def __init__(self, disk):
         self.disk = disk
 
-    def run(self, command, check=True):
+    def run(self, command):
         command = command.split()
         command = ['parted', '-a', 'optimal', '-s', self.disk] + command
-        if check:
-            return subprocess.check_output(command).decode('utf8')
-        else:
-            return subprocess.run(command, stdout=subprocess.PIPE).stdout.decode('utf8')
+        return subprocess.check_output(command).decode('utf8')
 
 def fixup(rootdir, vols):
     devbymount = {}
@@ -137,14 +125,9 @@ def fixup(rootdir, vols):
         sys.stdout.flush()
     for metafs in ('proc', 'sys', 'dev'):
         subprocess.check_call(['mount', '-o', 'bind', '/{}'.format(metafs), os.path.join(rootdir, metafs)])
-    if os.path.exists(os.path.join(rootdir, 'etc/lvm/devices/system.devices')):
-        os.remove(os.path.join(rootdir, 'etc/lvm/devices/system.devices'))
-    grubsyscfg = os.path.join(rootdir, 'etc/sysconfig/grub')
-    if not os.path.exists(grubsyscfg):
-        grubsyscfg = os.path.join(rootdir, 'etc/default/grub')
-    with open(grubsyscfg) as defgrubin:
+    with open(os.path.join(rootdir, 'etc/sysconfig/grub')) as defgrubin:
         defgrub = defgrubin.read().split('\n')
-    with open(grubsyscfg, 'w') as defgrubout:
+    with open(os.path.join(rootdir, 'etc/sysconfig/grub'), 'w') as defgrubout:
         for gline in defgrub:
             gline = gline.split()
             newline = []
@@ -153,34 +136,8 @@ def fixup(rootdir, vols):
                     continue
                 newline.append(ent)
             defgrubout.write(' '.join(newline) + '\n')
-    grubcfg = subprocess.check_output(['find', os.path.join(rootdir, 'boot'), '-name', 'grub.cfg']).decode('utf8').strip().replace(rootdir, '/').replace('//', '/')
-    grubcfg = grubcfg.split('\n')
-    if not grubcfg[-1]:
-        grubcfg = grubcfg[:-1]
-    if len(grubcfg) == 1:
-        grubcfg = grubcfg[0]
-    else:
-        for gcfg in grubcfg:
-            rgcfg = os.path.join(rootdir, gcfg[1:])  # gcfg has a leading / to get rid of
-            if os.stat(rgcfg).st_size > 256:
-                grubcfg = gcfg
-            else:
-                with open(rgcfg, 'r') as gin:
-                    tgrubcfg = gin.read()
-                tgrubcfg = tgrubcfg.split('\n')
-                if 'search --no-floppy --fs-uuid --set=dev' in tgrubcfg[0]:
-                    tgrubcfg[0] = 'search --no-floppy --fs-uuid --set=dev ' + bootuuid
-                with open(rgcfg, 'w') as gout:
-                    for gcline in tgrubcfg:
-                        gout.write(gcline)
-                        gout.write('\n')
-    try:
-        subprocess.check_call(['chroot', rootdir, 'grub2-mkconfig', '-o', grubcfg])
-    except Exception as e:
-        print(repr(e))
-        print(rootdir)
-        print(grubcfg)
-        time.sleep(86400)
+    grubcfg = subprocess.check_output(['find', os.path.join(rootdir, 'boot'), '-name', 'grub.cfg']).decode('utf8').strip().replace(rootdir, '/')
+    subprocess.check_call(['chroot', rootdir, 'grub2-mkconfig', '-o', grubcfg])
     newroot = None
     with open('/etc/shadow') as shadowin:
         shents = shadowin.read().split('\n')
@@ -209,8 +166,6 @@ def fixup(rootdir, vols):
             partnum = re.search('(\d+)$', targdev).group(1)
             targblock = re.search('(.*)\d+$', targdev).group(1)
     if targblock:
-        if 'nvme' in targblock and targblock[-1] == 'p':
-            targblock = targblock[:-1]
         shimpath = subprocess.check_output(['find', os.path.join(rootdir, 'boot/efi'), '-name', 'shimx64.efi']).decode('utf8').strip()
         shimpath = shimpath.replace(rootdir, '/').replace('/boot/efi', '').replace('//', '/').replace('/', '\\')
         subprocess.check_call(['efibootmgr', '-c', '-d', targblock, '-l', shimpath, '--part', partnum])
@@ -229,7 +184,6 @@ def had_swap():
     return False
 
 def install_to_disk(imgpath):
-    global bootuuid
     lvmvols = {}
     deftotsize = 0
     mintotsize = 0
@@ -270,7 +224,7 @@ def install_to_disk(imgpath):
         instdisk = diskin.read()
     instdisk = '/dev/' + instdisk
     parted = PartedRunner(instdisk)
-    dinfo = parted.run('unit s print', check=False)
+    dinfo = parted.run('unit s print')
     dinfo = dinfo.split('\n')
     sectors = 0
     sectorsize = 0
@@ -304,7 +258,7 @@ def install_to_disk(imgpath):
         if end > sectors:
             end = sectors
         parted.run('mkpart primary {}s {}s'.format(curroffset, end))
-        vol['targetdisk'] = get_partname(instdisk, volidx)
+        vol['targetdisk'] = instdisk + '{0}'.format(volidx)
         curroffset += size + 1
     if not lvmvols:
         if swapsize:
@@ -314,10 +268,10 @@ def install_to_disk(imgpath):
             if end > sectors:
                 end = sectors
             parted.run('mkpart swap {}s {}s'.format(curroffset, end))
-            subprocess.check_call(['mkswap', get_partname(instdisk, volidx + 1)])
+            subprocess.check_call(['mkswap', instdisk + '{}'.format(volidx + 1)])
     else:
         parted.run('mkpart lvm {}s 100%'.format(curroffset))
-        lvmpart = get_partname(instdisk, volidx + 1)
+        lvmpart = instdisk + '{}'.format(volidx + 1)
         subprocess.check_call(['pvcreate', '-ff', '-y', lvmpart])
         subprocess.check_call(['vgcreate', 'localstorage', lvmpart])
         vginfo = subprocess.check_output(['vgdisplay', 'localstorage', '--units', 'b']).decode('utf8')
@@ -412,14 +366,6 @@ def install_to_disk(imgpath):
                 sys.stdout.write('\x1b[1K\rDone writing {0}'.format(vol['mount']))
                 sys.stdout.write('\n')
                 sys.stdout.flush()
-                if vol['mount'] == '/boot':
-                    tbootuuid = subprocess.check_output(['blkid', vol['targetdisk']])
-                    if b'UUID="' in tbootuuid:
-                        bootuuid = tbootuuid.split(b'UUID="', 1)[1].split(b'"')[0].decode('utf8')
-
-
-
-
             subprocess.check_call(['umount', '/run/imginst/targ'])
         for vol in allvols:
             subprocess.check_call(['mount', vol['targetdisk'], '/run/imginst/targ/' + vol['mount']])
@@ -427,9 +373,4 @@ def install_to_disk(imgpath):
 
 
 if __name__ == '__main__':
-    try:
-        install_to_disk(os.environ['mountsrc'])
-    except Exception:
-        traceback.print_exc()
-        time.sleep(86400)
-        raise
+    install_to_disk(os.environ['mountsrc'])

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

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

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

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

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

@@ -7,16 +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}')
-hostnamectl set-hostname $nodename
 export nodename confluent_mgr confluent_profile
 . /etc/confluent/functions
 mkdir -p /var/log/confluent
@@ -27,9 +19,6 @@ chmod 600 /var/log/confluent/confluent-onboot.log
 tail -f /var/log/confluent/confluent-onboot.log > /dev/console &
 logshowpid=$!
 
-rpm --import /etc/pki/rpm-gpg/*
-
-run_remote_python add_local_repositories
 run_remote_python syncfileclient
 run_remote_python confignet
 

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

@@ -1,7 +1,4 @@
-#!/usr/bin/python3
-import random
-import time
-import subprocess
+#!/usr/bin/python
 import importlib
 import tempfile
 import json
@@ -9,7 +6,6 @@ import os
 import shutil
 import pwd
 import grp
-import sys
 from importlib.machinery import SourceFileLoader
 try:
     apiclient = SourceFileLoader('apiclient', '/opt/confluent/bin/apiclient').load_module()
@@ -215,31 +211,11 @@ 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 >= 300:
-            sys.stderr.write("Error starting syncfiles - {}:\n".format(status))
-            sys.stderr.write(rsp.decode('utf8'))
-            sys.stderr.write('\n')
-            sys.stderr.flush()
-            return status
         if status == 202:
             lastrsp = ''
             while status != 204:
-                time.sleep(1+(2*random.random()))
                 status, rsp = ac.grab_url_with_status('/confluent-api/self/remotesyncfiles')
                 if not isinstance(rsp, str):
                     rsp = rsp.decode('utf8')
@@ -287,21 +263,10 @@ def synchronize():
                             os.chmod(fname, int(opts[fname][opt], 8))
                     if uid != -1 or gid != -1:
                         os.chown(fname, uid, gid)
-        return status
     finally:
         shutil.rmtree(tmpdir)
         shutil.rmtree(appendoncedir)
 
 
 if __name__ == '__main__':
-    status = 202
-    while status not in (204, 200):
-        try:
-            status = synchronize()
-        except Exception as e:
-            sys.stderr.write(str(e))
-            sys.stderr.write('\n')
-            sys.stderr.flush()
-            status = 300
-        if status not in (204, 200):
-            time.sleep((random.random()*3)+2)
+    synchronize()

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

@@ -7,8 +7,8 @@ if ! grep console= /proc/cmdline >& /dev/null; then
     if [ -n "$autocons" ]; then
         echo console=$autocons |sed -e 's!/dev/!!' >> /tmp/01-autocons.conf
         autocons=${autocons%,*}
-        echo $autocons > /tmp/01-autocons.devnode
-        echo "Detected firmware specified console at $(cat /tmp/01-autocons.conf)" > $autocons
+	echo $autocons > /tmp/01-autocons.devnode
+	echo "Detected firmware specified console at $(cat /tmp/01-autocons.conf)" > $autocons
         echo "Initializing auto detected console when installer starts" > $autocons
     fi
 fi
@@ -16,5 +16,4 @@ if grep console=ttyS /proc/cmdline >& /dev/null; then
     echo "Serial console has been requested in the kernel arguments, the local video may not show progress" > /dev/tty1
 fi
 . /lib/anaconda-lib.sh
-echo rd.fcoe=0 > /etc/cmdline.d/nofcoe.conf
 wait_for_kickstart

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

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

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

@@ -1,16 +1,5 @@
 #!/bin/sh
 [ -e /tmp/confluent.initq ] && return 0
-. /lib/dracut-lib.sh
-setsid sh -c 'exec bash <> /dev/tty2 >&0 2>&1' &
-if [ -f /tmp/dd_disk ]; then
-    for dd in $(cat /tmp/dd_disk); do
-        if [ -e $dd ]; then
-            driver-updates --disk $dd $dd
-	    rm $dd
-        fi
-    done
-    rm /tmp/dd_disk
-fi
 udevadm trigger
 udevadm trigger --type=devices --action=add
 udevadm settle
@@ -29,6 +18,13 @@ function confluentpython() {
         /usr/bin/python2 $*
     fi
 }
+if [ -f /tmp/dd_disk ]; then
+    for dd in $(cat /tmp/dd_disk); do
+        if [ -e $dd ]; then
+            driver-updates --disk $dd $dd
+        fi
+    done
+fi
 vlaninfo=$(getarg vlan)
 if [ ! -z "$vlaninfo" ]; then
         vldev=${vlaninfo#*:}
@@ -42,136 +38,17 @@ umask 0077
 mkdir -p /etc/confluent
 echo -n > /etc/confluent/confluent.info
 umask $oum
-TRIES=5
-while [ ! -e /dev/disk/by-label ] && [ $TRIES -gt 0 ]; do
-    sleep 2
-    TRIES=$((TRIES - 1))
-done
-if [ -e /dev/disk/by-label/CNFLNT_IDNT ]; then
-    tmnt=/tmp/idntmnt
-    mkdir -p $tmnt
-    tcfg=/tmp/idnttmp
-    mount /dev/disk/by-label/CNFLNT_IDNT $tmnt
-    cd $tmnt
-    deploysrvs=$(sed -n '/^deploy_servers:/, /^[^-]/p' cnflnt.yml |grep ^-|sed -e 's/^- //'|grep -v :)
-    nodename=$(grep ^nodename: cnflnt.yml|awk '{print $2}')
-    sed -n '/^net_cfgs:/, /^[^- ]/{/^[^- ]/!p}' cnflnt.yml |sed -n '/^-/, /^-/{/^-/!p}'| sed -e 's/^[- ]*//'> $tcfg
-    autoconfigmethod=$(grep ^ipv4_method: $tcfg)
-    autoconfigmethod=${autoconfigmethod#ipv4_method: }
-     for i in /sys/class/net/*; do
-        ip link set $(basename $i) down
-        udevadm info $i | grep ID_NET_DRIVER=cdc_ether > /dev/null &&  continue
-        ip link set $(basename $i) up
-    done
-    TRIES=30
-    DETECTED=0
-    while [ "$DETECTED" = 0 ] && [ $TRIES -gt 0 ]; do
-        TRIES=$((TRIES - 1))
-        for NICGUESS in $(ip link|grep LOWER_UP|grep -v LOOPBACK| awk '{print $2}' | sed -e 's/:$//'); do
-            if [ "$autoconfigmethod" = "dhcp" ]; then
-                /usr/libexec/nm-initrd-generator ip=$NICGUESS:dhcp
-            else
-                v4addr=$(grep ^ipv4_address: $tcfg)
-                v4addr=${v4addr#ipv4_address: }
-                v4plen=${v4addr#*/}
-                v4addr=${v4addr%/*}
-                v4gw=$(grep ^ipv4_gateway: $tcfg)
-                v4gw=${v4gw#ipv4_gateway: }
-                ip addr add dev $NICGUESS $v4addr/$v4plen
-                if [ "$v4gw" = "null" ]; then
-                    v4gw=""
-                fi
-                if [ ! -z "$v4gw" ]; then
-                    ip route add default via $v4gw
-                fi
-                v4nm=$(grep ipv4_netmask: $tcfg)
-                v4nm=${v4nm#ipv4_netmask: }
-                DETECTED=0
-                for dsrv in $deploysrvs; do
-                    if curl --capath /tls/ -s --connect-timeout 3 https://$dsrv/confluent-public/ > /dev/null; then
-                        rm /run/NetworkManager/system-connections/*
-                        /usr/libexec/nm-initrd-generator ip=$v4addr::$v4gw:$v4nm:$hostname:$NICGUESS:none
-                        DETECTED=1
-                        ifname=$NICGUESS
-                        break
-                    fi
-                done
-                if [ ! -z "$v4gw" ]; then
-                    ip route del default via $v4gw
-                fi
-                ip addr flush dev $NICGUESS
-                if [ $DETECTED = 1 ]; then
-                    break
-                fi
-            fi
-        done
-    done
-    for NICGUESS in $(ip link|grep LOWER_UP|grep -v LOOPBACK| awk '{print $2}' | sed -e 's/:$//'); do
-        ip addr flush dev $NICGUESS
-        ip link set $NICGUESS down
-    done
-    NetworkManager --configure-and-quit=initrd --no-daemon
-    hmackeyfile=/tmp/cnflnthmackeytmp
-    echo -n $(grep ^apitoken: cnflnt.yml|awk '{print $2}') > $hmackeyfile
-    cd -
-    umount $tmnt
-    passfile=/tmp/cnflnttmppassfile
-    passcrypt=/tmp/cnflntcryptfile
-    hmacfile=/tmp/cnflnthmacfile
-    ln -s /opt/confluent/bin/clortho /opt/confluent/bin/genpasshmac
-    /opt/confluent/bin/genpasshmac $passfile $passcrypt $hmacfile $hmackeyfile
-    echo 'NODENAME: '$nodename > /etc/confluent/confluent.info
-    for deploysrv in $deploysrvs; do
-        echo 'MANAGER: '$deploysrv >> /etc/confluent/confluent.info
-    done
-    for deployer in $deploysrvs; do
-        if curl --capath /tls/ -f -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_CRYPTHMAC: $(cat $hmacfile)" -d@$passcrypt -k https://$deployer/confluent-api/self/registerapikey; then
-            cp $passfile /etc/confluent/confluent.apikey
-            confluent_apikey=$(cat /etc/confluent/confluent.apikey)
-            curl --capath /tls/ -sf -H "CONFLUENT_NODENAME: $nodename" -H "CONFLUENT_APIKEY: $confluent_apikey" https://$deployer/confluent-api/self/deploycfg2 > /etc/confluent/confluent.deploycfg
-            confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg)
-            confluent_profile=${confluent_profile#profile: }
-            mgr=$deployer
-            break
-        fi
-    done
-fi
 cd /sys/class/net
-if ! grep MANAGER: /etc/confluent/confluent.info; then
-    confluentsrv=$(getarg confluent)
-    if [ ! -z "$confluentsrv" ]; then
-        mgr=$confluentsrv
-        if [[ "$confluentsrv" = *":"* ]]; then
-            mgr="[$mgr]"
-            confluenthttpsrv=[$confluentsrv]
-            /usr/libexec/nm-initrd-generator ip=:dhcp6
-        else
-            confluenthttpsrv=$confluentsrv
-            /usr/libexec/nm-initrd-generator ip=:dhcp
-        fi
-        NetworkManager --configure-and-quit=initrd --no-daemon
-        myids=uuid=$(cat /sys/devices/virtual/dmi/id/product_uuid)
-        for mac in $(ip -br link|grep -v LOOPBACK|awk '{print $3}'); do
-            myids=$myids"/mac="$mac
-        done
-        myname=$(curl --capath /tls/ -sH "CONFLUENT_IDS: $myids" https://$confluenthttpsrv/confluent-api/self/whoami)
-        if [ ! -z "$myname" ]; then
-            echo NODENAME: $myname > /etc/confluent/confluent.info
-            echo MANAGER: $confluentsrv >> /etc/confluent/confluent.info
-            echo EXTMGRINFO: $confluentsrv'||1' >> /etc/confluent/confluent.info
-        fi
-    fi
-    while ! grep ^EXTMGRINFO: /etc/confluent/confluent.info | awk -F'|' '{print $3}' | grep 1 >& /dev/null && [ "$TRIES" -lt 60 ]; do
-        TRIES=$((TRIES + 1))
-        for currif in *; do
-            echo 0 > /proc/sys/net/ipv6/conf/${currif}/autoconf
-            ip link set $currif up
-        done
-        /opt/confluent/bin/copernicus -t > /etc/confluent/confluent.info
+while ! grep ^EXTMGRINFO: /etc/confluent/confluent.info | awk -F'|' '{print $3}' | grep 1 >& /dev/null && [ "$TRIES" -lt 60 ]; do
+    TRIES=$((TRIES + 1))
+    for currif in *; do
+        echo 0 > /proc/sys/net/ipv6/conf/${currif}/autoconf
+        ip link set $currif up
     done
-    grep ^EXTMGRINFO: /etc/confluent/confluent.info || return 0  # Do absolutely nothing if no data at all yet
-fi
+    /opt/confluent/bin/copernicus -t > /etc/confluent/confluent.info
+done
 cd /
+grep ^EXTMGRINFO: /etc/confluent/confluent.info || return 0  # Do absolutely nothing if no data at all yet
 echo -n "" > /tmp/confluent.initq
 # restart cmdline
 echo -n "" > /etc/cmdline.d/01-confluent.conf
@@ -186,20 +63,13 @@ if [ ! -z "$autocons" ]; then
     errout="-e $autocons"
 fi
 while ! confluentpython /opt/confluent/bin/apiclient $errout /confluent-api/self/deploycfg2 > /etc/confluent/confluent.deploycfg; do
-        sleep 10
+	sleep 10
 done
-ifidx=$(cat /tmp/confluent.ifidx 2> /dev/null)
-if [ -z "$ifname" ]; then
-    if [ ! -z "$ifidx" ]; then
-        ifname=$(ip link |grep ^$ifidx:|awk '{print $2}')
-        ifname=${ifname%:}
-        ifname=${ifname%@*}
-        echo $ifname > /tmp/net.ifaces
-    else
-        ip -br a|grep UP|awk '{print $1}' > /tmp/net.ifaces
-        ifname=$(cat /tmp/net.ifaces)
-    fi
-fi
+ifidx=$(cat /tmp/confluent.ifidx)
+ifname=$(ip link |grep ^$ifidx:|awk '{print $2}')
+ifname=${ifname%:}
+ifname=${ifname%@*}
+echo $ifname > /tmp/net.ifaces
 
 dnsdomain=$(grep ^dnsdomain: /etc/confluent/confluent.deploycfg)
 dnsdomain=${dnsdomain#dnsdomain: }
@@ -214,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]"
@@ -227,38 +96,23 @@ proto=${proto#protocol: }
 textconsole=$(grep ^textconsole: /etc/confluent/confluent.deploycfg)
 textconsole=${textconsole#textconsole: }
 if [ "$textconsole" = "true" ] && ! grep console= /proc/cmdline > /dev/null; then
-        autocons=$(cat /tmp/01-autocons.devnode)
-        if [ ! -z "$autocons" ]; then
-            echo Auto-configuring installed system to use text console
-            echo Auto-configuring installed system to use text console > $autocons
+	autocons=$(cat /tmp/01-autocons.devnode)
+	if [ ! -z "$autocons" ]; then
+	    echo Auto-configuring installed system to use text console
+	    echo Auto-configuring installed system to use text console > $autocons
             /opt/confluent/bin/autocons -c > /dev/null
-            cp /tmp/01-autocons.conf /etc/cmdline.d/
-        else
-            echo "Unable to automatically detect requested text console"
-        fi
+	    cp /tmp/01-autocons.conf /etc/cmdline.d/
+	else
+	    echo "Unable to automatically detect requested text console"
+	fi
 fi
 
-. /etc/os-release
-if [ "$ID" = "dracut" ]; then
-    ID=$(echo $PRETTY_NAME|awk '{print $1}')
-    VERSION_ID=$(echo $VERSION|awk '{print $1}')
-    if [ "$ID" = "Oracle" ]; then
-        ID=OL
-    elif [ "$ID" = "Red" ]; then
-        ID=RHEL
-    fi
-fi
-ISOSRC=$(blkid -t TYPE=iso9660|grep -Ei ' LABEL="'$ID-$VERSION_ID|sed -e s/:.*//)
-if [ -z "$ISOSRC" ]; then
-    echo inst.repo=$proto://$mgr/confluent-public/os/$profilename/distribution >> /etc/cmdline.d/01-confluent.conf
-    root=anaconda-net:$proto://$mgr/confluent-public/os/$profilename/distribution
-    export root
-else
-    echo inst.repo=cdrom:$ISOSRC >> /etc/cmdline.d/01-confluent.conf
-fi
+echo inst.repo=$proto://$mgr/confluent-public/os/$profilename/distribution >> /etc/cmdline.d/01-confluent.conf
 echo inst.ks=$proto://$mgr/confluent-public/os/$profilename/kickstart >> /etc/cmdline.d/01-confluent.conf
 kickstart=$proto://$mgr/confluent-public/os/$profilename/kickstart
+root=anaconda-net:$proto://$mgr/confluent-public/os/$profilename/distribution
 export kickstart
+export root
 autoconfigmethod=$(grep ipv4_method /etc/confluent/confluent.deploycfg)
 autoconfigmethod=${autoconfigmethod#ipv4_method: }
 if [ "$autoconfigmethod" = "dhcp" ]; then
@@ -338,8 +192,4 @@ if [ -e /lib/nm-lib.sh ]; then
         fi
     fi
 fi
-for NICGUESS in $(ip link|grep LOWER_UP|grep -v LOOPBACK| awk '{print $2}' | sed -e 's/:$//'); do
-    ip addr flush dev $NICGUESS
-    ip link set $NICGUESS down
-done
 

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

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

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

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

confluent_osdeploy/el8/profiles/default/initprofile.sh

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

confluent_osdeploy/el8/profiles/default/kickstart

@@ -33,7 +33,15 @@
 reboot
 
 %packages
-%include /tmp/pkglist
+@^minimal-environment
+#-kernel-uek # This can opt out of the UEK for the relevant distribution
+bind-utils
+chrony
+pciutils
+python3
+rsync
+tar
+-iwl*-firmware
 %include /tmp/addonpackages
 %include /tmp/cryptpkglist
 %end
@@ -51,16 +59,10 @@ v4cfg=${v4cfg#ipv4_method: }
 if [ "$v4cfg" = "static" ] || [ "$v4cfg" = "dhcp" ]; then
     confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server: }
-fi
-if [ -z "$confluent_mgr" ]; then
+else
     confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server_v6: }
-    if [ -z "$confluent_mgr" ]; then
-        confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
-        confluent_mgr=${confluent_mgr#deploy_server: }
-    else
-        confluent_mgr="[$confluent_mgr]"
-    fi
+    confluent_mgr="[$confluent_mgr]"
 fi
 confluent_profile=$(grep ^profile: /etc/confluent/confluent.deploycfg |awk '{print $2}')
 curl -f https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/pre.sh > /tmp/preinst.sh
@@ -75,16 +77,10 @@ v4cfg=${v4cfg#ipv4_method: }
 if [ "$v4cfg" = "static" ] || [ "$v4cfg" = "dhcp" ]; then
     confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server: }
-fi
-if [ -z "$confluent_mgr" ]; then
+else
     confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server_v6: }
-    if [ -z "$confluent_mgr" ]; then
-        confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
-        confluent_mgr=${confluent_mgr#deploy_server: }
-    else
-        confluent_mgr="[$confluent_mgr]"
-    fi
+    confluent_mgr="[$confluent_mgr]"
 fi
 curl -f https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/prechroot.sh > /tmp/postinst.sh
 . /tmp/postinst.sh
@@ -108,16 +104,10 @@ v4cfg=${v4cfg#ipv4_method: }
 if [ "$v4cfg" = "static" ] || [ "$v4cfg" = "dhcp" ]; then
     confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server: }
-fi
-if [ -z "$confluent_mgr" ]; then
+else
     confluent_mgr=$(grep ^deploy_server_v6: /etc/confluent/confluent.deploycfg)
     confluent_mgr=${confluent_mgr#deploy_server_v6: }
-    if [ -z "$confluent_mgr" ]; then
-        confluent_mgr=$(grep ^deploy_server: /etc/confluent/confluent.deploycfg)
-        confluent_mgr=${confluent_mgr#deploy_server: }
-    else
-        confluent_mgr="[$confluent_mgr]"
-    fi
+    confluent_mgr="[$confluent_mgr]"
 fi
 curl -f https://$confluent_mgr/confluent-public/os/$confluent_profile/scripts/post.sh > /tmp/postinst.sh
 . /tmp/postinst.sh

confluent_osdeploy/el8/profiles/default/packagelist

@@ -1,9 +0,0 @@
-@^minimal-environment
-#-kernel-uek # This can opt out of the UEK for the relevant distribution
-bind-utils
-chrony
-pciutils
-python3
-rsync
-tar
--iwl*-firmware

confluent_osdeploy/el8/profiles/default/partitioning

@@ -1,4 +0,0 @@
-clearpart --all --initlabel
-ignoredisk --only-use %%INSTALLDISK%%
-autopart --nohome %%LUKSHOOK%%
-

confluent_osdeploy/el8/profiles/default/scripts/add_local_repositories

@@ -3,34 +3,19 @@ try:
 except ImportError:
     import ConfigParser as configparser
     import cStringIO
-import importlib.util
-import importlib.machinery
+import imp
 import sys
-modloader = importlib.machinery.SourceFileLoader('apiclient', '/opt/confluent/bin/apiclient')
-modspec = importlib.util.spec_from_file_location('apiclient', '/opt/confluent/bin/apiclient', loader=modloader)
-apiclient = importlib.util.module_from_spec(modspec)
-modspec.loader.exec_module(apiclient)
+apiclient = imp.load_source('apiclient', '/etc/confluent/apiclient')
 repo = None
 server = None
-v4cfg = None
-server4 = None
-server6 = None
 profile = None
 with open('/etc/confluent/confluent.deploycfg') as dplcfgfile:
     lines = dplcfgfile.read().split('\n')
     for line in lines:
         if line.startswith('deploy_server:'):
-           _, server4 = line.split(' ', 1)
-        if line.startswith('deploy_server_v6:'):
-           _, server6 = line.split(' ', 1)
+           _, server = line.split(' ', 1)
         if line.startswith('profile: '):
            _, profile = line.split(' ', 1)
-        if line.startswith('ipv4_method: '):
-           _, v4cfg = line.split(' ', 1)
-if v4cfg == 'static' or v4cfg =='dhcp' or not server6:
-    server = server4
-if not server:
-    server = '[{}]'.format(server6)
 
 path = '/confluent-public/os/{0}/distribution/'.format(profile)
 clnt = apiclient.HTTPSClient()

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

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

confluent_osdeploy/el8/profiles/default/scripts/functions

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

confluent_osdeploy/el8/profiles/default/scripts/getinstalldisk

@@ -3,8 +3,6 @@ import os
 
 class DiskInfo(object):
     def __init__(self, devname):
-        if devname.startswith('nvme') and 'c' in devname:
-            raise Exception("Skipping multipath devname")
         self.name = devname
         self.wwn = None
         self.path = None
@@ -56,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