From 7727cd86fc44b7ebb3f897163c0a673eb1be851e Mon Sep 17 00:00:00 2001 From: Markus Hilger Date: Thu, 2 Jul 2026 22:07:27 +0200 Subject: [PATCH] Fix typos in help text, errors, and log messages --- confluent_client/bin/confetty | 4 ++-- confluent_client/bin/nodeattrib | 2 +- confluent_client/bin/nodebmcpassword | 2 +- confluent_client/bin/nodeconsole | 2 +- confluent_client/bin/nodedeploy | 2 +- confluent_client/bin/nodegroupattrib | 2 +- confluent_client/bin/nodelist | 2 +- .../debian/profiles/default/scripts/pre.sh | 2 +- .../lib/dracut/hooks/cmdline/10-confluentdiskless.sh | 4 ++-- .../lib/dracut/hooks/cmdline/10-confluentdiskless.sh | 4 ++-- .../lib/dracut/hooks/cmdline/10-confluentdiskless.sh | 4 ++-- .../suse15/profiles/hpc/scripts/pre.sh | 2 +- .../suse15/profiles/server/scripts/pre.sh | 2 +- .../ubuntu18.04/profiles/default/scripts/pre.sh | 2 +- .../ubuntu20.04/profiles/default/scripts/pre.sh | 2 +- .../ubuntu22.04/profiles/default/scripts/pre.sh | 4 ++-- confluent_perl/Confluent/Client.pm | 2 +- confluent_server/confluent/collective/manager.py | 6 +++--- confluent_server/confluent/config/attributes.py | 12 ++++++------ confluent_server/confluent/core.py | 2 +- confluent_server/confluent/discovery/core.py | 4 ++-- confluent_server/confluent/discovery/handlers/xcc.py | 2 +- .../confluent/discovery/protocols/pxe.py | 2 +- confluent_server/confluent/log.py | 2 +- .../confluent/plugins/hardwaremanagement/enlogic.py | 2 +- .../confluent/plugins/hardwaremanagement/proxmox.py | 2 +- confluent_server/confluent/webauthn.py | 2 +- genesis/confluent-genesis.spec | 2 +- 28 files changed, 41 insertions(+), 41 deletions(-) diff --git a/confluent_client/bin/confetty b/confluent_client/bin/confetty index 34a1217c..a142b6c2 100755 --- a/confluent_client/bin/confetty +++ b/confluent_client/bin/confetty @@ -108,8 +108,8 @@ class BailOut(Exception): def print_help(): print("confetty provides a filesystem like interface to confluent. " "Navigation is done using the same commands as would be used in a " - "filesystem. Tab completion is supported to aid in navigation," - "as is up arrow to recall previous commands and control-r to search" + "filesystem. Tab completion is supported to aid in navigation, " + "as is up arrow to recall previous commands and control-r to search " "previous command history, similar to using bash\n\n" "The supported commands are:\n" "cd [location] - Set the current command context, similar to a " diff --git a/confluent_client/bin/nodeattrib b/confluent_client/bin/nodeattrib index 8a405e64..743dd777 100755 --- a/confluent_client/bin/nodeattrib +++ b/confluent_client/bin/nodeattrib @@ -45,7 +45,7 @@ async def main(): \n %prog noderange attribute1=value1 attribute2=value,... \n ''') argparser.add_option('-b', '--blame', action='store_true', - help='Show information about how attributes inherited') + help='Show information about how attributes are inherited') argparser.add_option('-e', '--environment', action='store_true', help='Set attributes, but from environment variable of ' 'same name') diff --git a/confluent_client/bin/nodebmcpassword b/confluent_client/bin/nodebmcpassword index 135abb96..0b8883bd 100755 --- a/confluent_client/bin/nodebmcpassword +++ b/confluent_client/bin/nodebmcpassword @@ -40,7 +40,7 @@ argparser.add_option('-m', '--maxnodes', type='int', 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 ' + help='Set password, but from environment variable of ' 'same name') diff --git a/confluent_client/bin/nodeconsole b/confluent_client/bin/nodeconsole index b8ae0b66..29e9f204 100755 --- a/confluent_client/bin/nodeconsole +++ b/confluent_client/bin/nodeconsole @@ -106,7 +106,7 @@ argparser.add_option('-w','--windowed', action='store_true', default=False, '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' + 'environment variable isn\'t set, xterm will be used by ' 'default.') (options, args) = argparser.parse_args() diff --git a/confluent_client/bin/nodedeploy b/confluent_client/bin/nodedeploy index a3ff7707..79afa33f 100755 --- a/confluent_client/bin/nodedeploy +++ b/confluent_client/bin/nodedeploy @@ -80,7 +80,7 @@ def main(args): ap.add_argument('-n', '--network', help='Initiate deployment over PXE/HTTP', action='store_true') ap.add_argument('-b', '--bootmethod', help='Specify network boot method (e.g., network, http)', default='network') ap.add_argument('-p', '--prepareonly', help='Prepare only, skip any interaction with a BMC associated with this deployment action', action='store_true') - ap.add_argument('-m', '--maxnodes', help='Specifiy a maximum nodes to be deployed') + ap.add_argument('-m', '--maxnodes', help='Specify a maximum nodes to be deployed') ap.add_argument('-r', '--redeploy', help='Redeploy nodes with the current or pending profile', action='store_true') ap.add_argument('noderange', help='Set of nodes to deploy') ap.add_argument('profile', nargs='?', help='Profile name to deploy') diff --git a/confluent_client/bin/nodegroupattrib b/confluent_client/bin/nodegroupattrib index b541244c..d62ffd9b 100755 --- a/confluent_client/bin/nodegroupattrib +++ b/confluent_client/bin/nodegroupattrib @@ -42,7 +42,7 @@ argparser = optparse.OptionParser( \n %prog [options] nodegroup nodes=value1,value2 \n ''') argparser.add_option('-b', '--blame', action='store_true', - help='Show information about how attributes inherited') + help='Show information about how attributes are inherited') argparser.add_option('-e', '--environment', action='store_true', help='Set attributes, but from environment variable of ' 'same name') diff --git a/confluent_client/bin/nodelist b/confluent_client/bin/nodelist index 70588a9e..8f3b3ee3 100755 --- a/confluent_client/bin/nodelist +++ b/confluent_client/bin/nodelist @@ -41,7 +41,7 @@ async def main(): usage="Usage: %prog noderange\n" " or: %prog [options] noderange ...") argparser.add_option('-b', '--blame', action='store_true', - help='Show information about how attributes inherited') + help='Show information about how attributes are inherited') argparser.add_option('-d', '--delim', metavar="STRING", default = "\n", help='Delimiter separating the values') (options, args) = argparser.parse_args() diff --git a/confluent_osdeploy/debian/profiles/default/scripts/pre.sh b/confluent_osdeploy/debian/profiles/default/scripts/pre.sh index 6e8b9c4c..f30d81bb 100755 --- a/confluent_osdeploy/debian/profiles/default/scripts/pre.sh +++ b/confluent_osdeploy/debian/profiles/default/scripts/pre.sh @@ -9,7 +9,7 @@ mgr=$(cat /etc/confluent/deployer) cryptboot=$(grep encryptboot: $deploycfg|sed -e 's/^encryptboot: //') if [ "$cryptboot" != "" ] && [ "$cryptboot" != "none" ] && [ "$cryptboot" != "null" ]; then echo "****Encrypted boot requested, but not implemented for this OS, halting install" > /dev/console - [ -f '/tmp/autoconsdev' ] && (echo "****Encryptod boot requested, but not implemented for this OS,halting install" >> $(cat /tmp/autoconsdev)) + [ -f '/tmp/autoconsdev' ] && (echo "****Encrypted boot requested, but not implemented for this OS, halting install" >> $(cat /tmp/autoconsdev)) while :; do sleep 86400; done fi cat > /usr/lib/live-installer.d/confluent-certs << EOF diff --git a/confluent_osdeploy/el10-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh b/confluent_osdeploy/el10-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh index 41675c36..e3d01a09 100644 --- a/confluent_osdeploy/el10-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh +++ b/confluent_osdeploy/el10-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh @@ -143,8 +143,8 @@ while [ $ready = "0" ]; do elif grep 'SSL' $tmperr > /dev/null; then confluent_mgr=${confluent_mgr#[} confluent_mgr=${confluent_mgr%]} - echo 'Failure establishing TLS conneection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' - if [ ! -z "$autoconsdev" ]; then echo 'Failure establishing TLS conneection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' > $autoconsdev; fi + echo 'Failure establishing TLS connection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' + if [ ! -z "$autoconsdev" ]; then echo 'Failure establishing TLS connection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' > $autoconsdev; fi sleep 10 else ready=1 diff --git a/confluent_osdeploy/el8-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh b/confluent_osdeploy/el8-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh index cb7b7372..6962e31e 100644 --- a/confluent_osdeploy/el8-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh +++ b/confluent_osdeploy/el8-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh @@ -174,8 +174,8 @@ while [ $ready = "0" ]; do elif grep 'SSL' $tmperr > /dev/null; then confluent_mgr=${confluent_mgr#[} confluent_mgr=${confluent_mgr%]} - echo 'Failure establishing TLS conneection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' - if [ ! -z "$autoconsdev" ]; then echo 'Failure establishing TLS conneection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' > $autoconsdev; fi + echo 'Failure establishing TLS connection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' + if [ ! -z "$autoconsdev" ]; then echo 'Failure establishing TLS connection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' > $autoconsdev; fi sleep 10 else ready=1 diff --git a/confluent_osdeploy/el9-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh b/confluent_osdeploy/el9-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh index b46a22ac..a2867f1d 100644 --- a/confluent_osdeploy/el9-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh +++ b/confluent_osdeploy/el9-diskless/initramfs/usr/lib/dracut/hooks/cmdline/10-confluentdiskless.sh @@ -145,8 +145,8 @@ while [ $ready = "0" ]; do elif grep 'SSL' $tmperr > /dev/null; then confluent_mgr=${confluent_mgr#[} confluent_mgr=${confluent_mgr%]} - echo 'Failure establishing TLS conneection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' - if [ ! -z "$autoconsdev" ]; then echo 'Failure establishing TLS conneection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' > $autoconsdev; fi + echo 'Failure establishing TLS connection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' + if [ ! -z "$autoconsdev" ]; then echo 'Failure establishing TLS connection to '$confluent_mgr' (try `osdeploy initialize -t` on the deployment server)' > $autoconsdev; fi sleep 10 else ready=1 diff --git a/confluent_osdeploy/suse15/profiles/hpc/scripts/pre.sh b/confluent_osdeploy/suse15/profiles/hpc/scripts/pre.sh index 0bc969dd..a1e27f7f 100644 --- a/confluent_osdeploy/suse15/profiles/hpc/scripts/pre.sh +++ b/confluent_osdeploy/suse15/profiles/hpc/scripts/pre.sh @@ -15,7 +15,7 @@ fi cryptboot=$(grep encryptboot: /etc/confluent/confluent.deploycfg|sed -e 's/^encryptboot: //') if [ "$cryptboot" != "" ] && [ "$cryptboot" != "none" ] && [ "$cryptboot" != "null" ]; then echo "****Encrypted boot requested, but not implemented for this OS, halting install" > /dev/console - [ -f '/tmp/autoconsdev' ] && (echo "****Encryptod boot requested, but not implemented for this OS,halting install" >> $(cat /tmp/autoconsdev)) + [ -f '/tmp/autoconsdev' ] && (echo "****Encrypted boot requested, but not implemented for this OS, halting install" >> $(cat /tmp/autoconsdev)) while :; do sleep 86400; done fi diff --git a/confluent_osdeploy/suse15/profiles/server/scripts/pre.sh b/confluent_osdeploy/suse15/profiles/server/scripts/pre.sh index 0bc969dd..a1e27f7f 100644 --- a/confluent_osdeploy/suse15/profiles/server/scripts/pre.sh +++ b/confluent_osdeploy/suse15/profiles/server/scripts/pre.sh @@ -15,7 +15,7 @@ fi cryptboot=$(grep encryptboot: /etc/confluent/confluent.deploycfg|sed -e 's/^encryptboot: //') if [ "$cryptboot" != "" ] && [ "$cryptboot" != "none" ] && [ "$cryptboot" != "null" ]; then echo "****Encrypted boot requested, but not implemented for this OS, halting install" > /dev/console - [ -f '/tmp/autoconsdev' ] && (echo "****Encryptod boot requested, but not implemented for this OS,halting install" >> $(cat /tmp/autoconsdev)) + [ -f '/tmp/autoconsdev' ] && (echo "****Encrypted boot requested, but not implemented for this OS, halting install" >> $(cat /tmp/autoconsdev)) while :; do sleep 86400; done fi diff --git a/confluent_osdeploy/ubuntu18.04/profiles/default/scripts/pre.sh b/confluent_osdeploy/ubuntu18.04/profiles/default/scripts/pre.sh index b480cce0..10d4d630 100755 --- a/confluent_osdeploy/ubuntu18.04/profiles/default/scripts/pre.sh +++ b/confluent_osdeploy/ubuntu18.04/profiles/default/scripts/pre.sh @@ -9,7 +9,7 @@ mgr=$(cat /etc/confluent/deployer) cryptboot=$(grep encryptboot: $deploycfg|sed -e 's/^encryptboot: //') if [ "$cryptboot" != "" ] && [ "$cryptboot" != "none" ] && [ "$cryptboot" != "null" ]; then echo "****Encrypted boot requested, but not implemented for this OS, halting install" > /dev/console - [ -f '/tmp/autoconsdev' ] && (echo "****Encryptod boot requested, but not implemented for this OS,halting install" >> $(cat /tmp/autoconsdev)) + [ -f '/tmp/autoconsdev' ] && (echo "****Encrypted boot requested, but not implemented for this OS, halting install" >> $(cat /tmp/autoconsdev)) while :; do sleep 86400; done fi cat > /usr/lib/live-installer.d/confluent-certs << EOF diff --git a/confluent_osdeploy/ubuntu20.04/profiles/default/scripts/pre.sh b/confluent_osdeploy/ubuntu20.04/profiles/default/scripts/pre.sh index 02801849..745f3590 100755 --- a/confluent_osdeploy/ubuntu20.04/profiles/default/scripts/pre.sh +++ b/confluent_osdeploy/ubuntu20.04/profiles/default/scripts/pre.sh @@ -15,7 +15,7 @@ chmod 600 /var/log/confluent/confluent-pre.log cryptboot=$(grep encryptboot: $deploycfg|sed -e 's/^encryptboot: //') if [ "$cryptboot" != "" ] && [ "$cryptboot" != "none" ] && [ "$cryptboot" != "null" ]; then echo "****Encrypted boot requested, but not implemented for this OS, halting install" > /dev/console - [ -f '/tmp/autoconsdev' ] && (echo "****Encryptod boot requested, but not implemented for this OS,halting install" >> $(cat /tmp/autoconsdev)) + [ -f '/tmp/autoconsdev' ] && (echo "****Encrypted boot requested, but not implemented for this OS, halting install" >> $(cat /tmp/autoconsdev)) while :; do sleep 86400; done fi diff --git a/confluent_osdeploy/ubuntu22.04/profiles/default/scripts/pre.sh b/confluent_osdeploy/ubuntu22.04/profiles/default/scripts/pre.sh index f48d8d60..5a863f9f 100755 --- a/confluent_osdeploy/ubuntu22.04/profiles/default/scripts/pre.sh +++ b/confluent_osdeploy/ubuntu22.04/profiles/default/scripts/pre.sh @@ -49,8 +49,8 @@ if [ "$cryptboot" != "" ] && [ "$cryptboot" != "none" ] && [ "$cryptboot" != "n export lukspass run_remote_python addcrypt if ! grep 'password:' /autoinstall.yaml > /dev/null; then - echo "****Encrypted boot requested, but the user-data does not have a hook to enable,halting install" > /dev/console - [ -f '/tmp/autoconsdev' ] && (echo "****Encryptod boot requested, but the user-data does not have a hook to enable,halting install" >> $(cat /tmp/autoconsdev)) + echo "****Encrypted boot requested, but the user-data does not have a hook to enable, halting install" > /dev/console + [ -f '/tmp/autoconsdev' ] && (echo "****Encrypted boot requested, but the user-data does not have a hook to enable, halting install" >> $(cat /tmp/autoconsdev)) while :; do sleep 86400; done fi sed -i s!%%CRYPTPASS%%!$lukspass! /autoinstall.yaml diff --git a/confluent_perl/Confluent/Client.pm b/confluent_perl/Confluent/Client.pm index 7dd26f91..e8c0104a 100644 --- a/confluent_perl/Confluent/Client.pm +++ b/confluent_perl/Confluent/Client.pm @@ -61,7 +61,7 @@ sub _verify { $knownhosts{$peername} = $addfingerprint; } if (not $knownhosts{$peername}) { - die "UKNNOWN_FINGERPRINT: fingerprint=>$fingerprint" + die "UNKNOWN_FINGERPRINT: fingerprint=>$fingerprint" } if ($fingerprint ne $knownhosts{$peername}) { die "CONFLICT_FINGERPRINT: fingerprint=>$fingerprint"; diff --git a/confluent_server/confluent/collective/manager.py b/confluent_server/confluent/collective/manager.py index edaff5b6..d9a44828 100644 --- a/confluent_server/confluent/collective/manager.py +++ b/confluent_server/confluent/collective/manager.py @@ -533,7 +533,7 @@ async def handle_connection(connection, cert, request, local=False): return if request['txcount'] < cfm._txcount: await tlvdata.send(connection, - {'error': 'Refusing to be assimilated by inferior' + {'error': 'Refusing to be assimilated by inferior ' 'transaction count', 'txcount': cfm._txcount,}) return @@ -637,7 +637,7 @@ async def handle_connection(connection, cert, request, local=False): if request['txcount'] > cfm._txcount: await retire_as_leader() await tlvdata.send(connection, - {'error': 'Client has higher tranasaction count, ' + {'error': 'Client has higher transaction count, ' 'should assimilate me, connecting..', 'txcount': cfm._txcount}) log.log({'info': 'Connecting to leader due to superior ' @@ -763,7 +763,7 @@ async def get_leader(connection): msg = 'Becoming leader as no leader known' else: msg = 'Becoming leader because {0} attempted to connect and it ' \ - 'is current leader'.format(currentleader) + 'is the current leader'.format(currentleader) log.log({'info': msg, 'subsystem': 'collective'}) await become_leader(connection) return currentleader diff --git a/confluent_server/confluent/config/attributes.py b/confluent_server/confluent/config/attributes.py index d2763012..21cc2b29 100644 --- a/confluent_server/confluent/config/attributes.py +++ b/confluent_server/confluent/config/attributes.py @@ -247,7 +247,7 @@ node = { }, 'deployment.state': { - 'description': ('Profiles may push more specific state, for example, it may set the state to "failed" or "succeded"'), + 'description': ('Profiles may push more specific state, for example, it may set the state to "failed" or "succeeded"'), }, 'deployment.state_detail': { 'description': ('Detailed state information as reported by an OS profile, when available'), @@ -268,7 +268,7 @@ node = { 'description': 'Any specified rules shall be configured on the BMC ' 'upon discovery. "expiration=no,loginfailures=no,complexity=no,reuse=no" ' 'would disable password expiration, login failures ' - 'triggering a lockout, password complexity requirements,' + 'triggering a lockout, password complexity requirements, ' 'and any restrictions around reusing an old password.', 'validlistkeys': ('expiration', 'loginfailures', 'complexity', 'reuse'), }, @@ -487,7 +487,7 @@ node = { 'the discovery process to decide where to place the mac address of a detected PXE nic.', }, 'net.connection_name': { - 'description': 'Name to use when specifiying a name for connection and/or interface name for a team/bond. This may be the name of a team/bond interface, ' + 'description': 'Name to use when specifying a name for connection and/or interface name for a team/bond. This may be the name of a team/bond interface, ' 'the connection name in network manager for the interface, or may be installed as an altname ' 'as supported by the respective OS deployment profiles. Default is to accept default name for ' 'a team/bond consistent with the respective OS, or to use the matching original port name as connection name.' @@ -593,7 +593,7 @@ node = { 'description': 'Specifies the managed PDU associated with a power input on the node' }, 'power.outlet': { - 'description': 'Species the outlet identifier on the PDU associoted with a power input on the node' + 'description': 'Specifies the outlet identifier on the PDU associated with a power input on the node' }, # 'id.modelnumber': { # 'description': 'The manufacturer dictated model number for the node', @@ -614,7 +614,7 @@ node = { 'description': 'A one-time use shared secret to authenticate a node api token', }, 'secret.snmpcommunity': { - 'description': ('SNMPv1 community string, it is highly recommended to' + 'description': ('SNMPv1 community string, it is highly recommended to ' 'step up to SNMPv3'), }, 'snmp.privacyprotocol': { @@ -676,7 +676,7 @@ node = { 'validvalues': ('tofu', 'manual', 'ca', 'ca-only'), }, 'pubkeys.tls_hardwaremanager': { - 'description': ('Fingerprint of the TLS certificate recognized as' + 'description': ('Fingerprint of the TLS certificate recognized as ' 'belonging to the hardware manager of the server'), }, 'pubkeys.tls': { diff --git a/confluent_server/confluent/core.py b/confluent_server/confluent/core.py index c73c22ba..575650b4 100644 --- a/confluent_server/confluent/core.py +++ b/confluent_server/confluent/core.py @@ -1349,7 +1349,7 @@ async def dispatch_request(nodes, manager, element, configmanager, inputdata, if isinstance(rsp, Exception): raise rsp if not rsp: - raise Exception('Error in cross-collective serialize/deserialze, see remote logs') + raise Exception('Error in cross-collective serialize/deserialize, see remote logs') yield rsp diff --git a/confluent_server/confluent/discovery/core.py b/confluent_server/confluent/discovery/core.py index 5c9b17eb..6118b63b 100644 --- a/confluent_server/confluent/discovery/core.py +++ b/confluent_server/confluent/discovery/core.py @@ -1258,7 +1258,7 @@ async def eval_node(cfg, handler, info, nodename, manual=False): except Exception as e: unknown_info[info['hwaddr']] = info info['discostatus'] = 'unidentified' - errorstr = 'An error occured during discovery, check the ' \ + errorstr = 'An error occurred during discovery, check the ' \ 'trace and stderr logs, mac was {0} and ip was {1}' \ ', the node or the containing enclosure was {2}' \ ''.format(info['hwaddr'], handler.ipaddr, nodename) @@ -1505,7 +1505,7 @@ async def discover_node(cfg, handler, info, nodename, manual): bmcaddr = cfg.get_node_attributes(nodename, 'hardwaremanagement.manager') bmcaddr = bmcaddr.get(nodename, {}).get('hardwaremanagement.manager', {}).get('value', '') if not bmcaddr: - log.log({'error': 'Unable to get BMC address for {0]'.format(nodename)}) + log.log({'error': 'Unable to get BMC address for {0}'.format(nodename)}) else: bmcaddr = bmcaddr.split('/', 1)[0] await wait_for_connection(bmcaddr) diff --git a/confluent_server/confluent/discovery/handlers/xcc.py b/confluent_server/confluent/discovery/handlers/xcc.py index 86459d8d..d0353a60 100644 --- a/confluent_server/confluent/discovery/handlers/xcc.py +++ b/confluent_server/confluent/discovery/handlers/xcc.py @@ -540,7 +540,7 @@ class NodeHandler(immhandler.NodeHandler): if not nwc: if not pwdchanged: pwdchanged = 'Unknown' - raise Exception('Error converting from sha356account: ' + repr(pwdchanged)) + raise Exception('Error converting from sha256account: ' + repr(pwdchanged)) if not pwdchanged: await nwc.grab_json_response( '/api/function', diff --git a/confluent_server/confluent/discovery/protocols/pxe.py b/confluent_server/confluent/discovery/protocols/pxe.py index a5e15849..61c4971b 100644 --- a/confluent_server/confluent/discovery/protocols/pxe.py +++ b/confluent_server/confluent/discovery/protocols/pxe.py @@ -784,7 +784,7 @@ async def reply_dhcp4(node, info, packet, cfg, reqview, httpboot, cfd, profile, if not profile: profile, stgprofile = get_deployment_profile(node, cfg) if not profile: - log.log({'info': 'No pending profile for {0}, skipping proxyDHCP eply'.format(node)}) + log.log({'info': 'No pending profile for {0}, skipping proxyDHCP reply'.format(node)}) return bootfile = 'http://{0}/confluent-public/os/{1}/boot.ipxe'.format(myipn, profile).encode('utf8') else: diff --git a/confluent_server/confluent/log.py b/confluent_server/confluent/log.py index 987f7560..9ebd2a2e 100644 --- a/confluent_server/confluent/log.py +++ b/confluent_server/confluent/log.py @@ -232,7 +232,7 @@ class TimedAndSizeRotatingFileHandler(BaseRotatingHandler): if self.maxBytes < 8192: raise exc.GlobalConfigError("The minimum value of max_bytes " "of log rolling size in the log " - "section should larger than 8192.") + "section should be larger than 8192.") self.utc = conf.get_boolean_option('log', 'utc') or False # Calculate the real rollover interval, which is just the number of diff --git a/confluent_server/confluent/plugins/hardwaremanagement/enlogic.py b/confluent_server/confluent/plugins/hardwaremanagement/enlogic.py index 159d1c96..bd4d5dd2 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/enlogic.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/enlogic.py @@ -48,7 +48,7 @@ class EnlogicClient(object): if self._wc: print("done cache") return self._wc - print("loggin") + print("logging") targcfg = self.configmanager.get_node_attributes( self.node, ['hardwaremanagement.manager'], decrypt=True ) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/proxmox.py b/confluent_server/confluent/plugins/hardwaremanagement/proxmox.py index 5e6bc1e4..0b84939e 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/proxmox.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/proxmox.py @@ -306,7 +306,7 @@ class PmxApiClient: return 'on' elif currstatus == 'stopped': return 'off' - raise Exception("Unknnown response to status query") + raise Exception("Unknown response to status query") async def set_vm_power(self, vm, state): host, guest = await self.get_vm(vm) diff --git a/confluent_server/confluent/webauthn.py b/confluent_server/confluent/webauthn.py index cdbc2046..3cbf7c13 100644 --- a/confluent_server/confluent/webauthn.py +++ b/confluent_server/confluent/webauthn.py @@ -134,7 +134,7 @@ class User(): def registration_request(username, cfg, APP_RELYING_PARTY): user_model = User.get(username) if user_model is None: - raise Exception("User not foud") + raise Exception("User not found") options = generate_registration_options( rp_name=APP_RELYING_PARTY.name, diff --git a/genesis/confluent-genesis.spec b/genesis/confluent-genesis.spec index a7be427e..4f7f01c3 100644 --- a/genesis/confluent-genesis.spec +++ b/genesis/confluent-genesis.spec @@ -11,7 +11,7 @@ AutoProv: false License: Various %Description -A small linux environment to proved a servicing image to boot systems into if needed. +A small linux environment to provide a servicing image to boot systems into if needed. %prep