mirror of
https://github.com/xcat2/confluent.git
synced 2026-08-05 10:17:51 +00:00
Fix typos in help text, errors, and log messages
This commit is contained in:
Markus Hilger
@@ -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 "
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -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')
|
||||
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -41,7 +41,7 @@ async def main():
|
||||
usage="Usage: %prog noderange\n"
|
||||
" or: %prog [options] noderange <nodeattribute>...")
|
||||
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()
|
||||
|
||||
@@ -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
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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': {
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user