openstack/ironic
Code Issues Proposed changes

Merge "Add missing ws separator between words"

Browse Source
This commit is contained in:
Zuul
2018-11-20 12:43:45 +00:00
committed by Gerrit Code Review
parent 8bf0d866ae 644f6e2c1d
commit e78c4f4983
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ironic/drivers/modules/console_utils.py
View File

@@ -217,8 +217,9 @@ def start_shellinabox_console(node_uuid, port, console_cmd):
raise loopingcall.LoopingCallDone() raise loopingcall.LoopingCallDone()
if (time.time() > expiration): if (time.time() > expiration):
locals['errstr'] = _("Timeout while waiting for console subprocess" locals['errstr'] = (_("Timeout while waiting for console "
"to start for node %s.") % node_uuid "subprocess to start for node %s.") %
node_uuid)
LOG.warning(locals['errstr']) LOG.warning(locals['errstr'])
raise loopingcall.LoopingCallDone() raise loopingcall.LoopingCallDone()

2
ironic/drivers/modules/ilo/common.py
View File

@@ -206,7 +206,7 @@ def remove_image_from_swift(object_name, associated_with=None):
swift_api = swift.SwiftAPI() swift_api = swift.SwiftAPI()
swift_api.delete_object(container, object_name) swift_api.delete_object(container, object_name)
except exception.SwiftObjectNotFoundError as e: except exception.SwiftObjectNotFoundError as e:
LOG.info("Temporary object %(associated_with_msg)s" LOG.info("Temporary object %(associated_with_msg)s "
"was already deleted from Swift. Error: %(err)s", "was already deleted from Swift. Error: %(err)s",
{'associated_with_msg': {'associated_with_msg':
("associated with %s " % associated_with ("associated with %s " % associated_with

2
ironic/drivers/modules/snmp.py
View File

@@ -974,7 +974,7 @@ def _parse_driver_info_snmpv3_crypto(node, info):
'priv_key' not in snmp_info): 'priv_key' not in snmp_info):
raise exception.MissingParameterValue(_( raise exception.MissingParameterValue(_(
"SNMPPowerDriver: missing SNMPv3 privacy key while " "SNMPPowerDriver: missing SNMPv3 privacy key while "
"`driver_info/snmp_priv_protocol` is present. Please" "`driver_info/snmp_priv_protocol` is present. Please "
"add `driver_info/snmp_priv_key` to node %(node)s " "add `driver_info/snmp_priv_key` to node %(node)s "
"configuration.") % {'node': node.uuid}) "configuration.") % {'node': node.uuid})