openstack/nova
Code Issues Proposed changes

Merge "Add missing ws seperator between words"

Browse Source
This commit is contained in:
Zuul 2019-01-25 14:22:28 +00:00 committed by Gerrit Code Review
commit e3fc005e4e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nova/virt/libvirt/driver.py
View File

@ -552,11 +552,11 @@ class LibvirtDriver(driver.ComputeDriver):
# nonsensical.
if (CONF.libvirt.live_migration_tunnelled and
CONF.libvirt.live_migration_with_native_tls):
msg = _("Setting both 'live_migration_tunnelled' and"
"'live_migration_with_native_tls' at the same"
"time is invalid. If you have the relevant"
"libvirt and QEMU versions, and TLS configured"
"in your environment, pick"
msg = _("Setting both 'live_migration_tunnelled' and "
"'live_migration_with_native_tls' at the same "
"time is invalid. If you have the relevant "
"libvirt and QEMU versions, and TLS configured "
"in your environment, pick "
"'live_migration_with_native_tls'.")
raise exception.Invalid(msg)
@ -5731,7 +5731,7 @@ class LibvirtDriver(driver.ComputeDriver):
total_pcpus = self._host.get_cpu_count()
except libvirt.libvirtError:
LOG.warning("Cannot get the number of cpu, because this "
"function is not implemented for this platform. ")
"function is not implemented for this platform.")
return 0
if not CONF.vcpu_pin_set:
@ -7108,7 +7108,7 @@ class LibvirtDriver(driver.ComputeDriver):
if CONF.serial_console.enabled:
msg = _('Your destination node does not support'
' retrieving listen addresses. In order'
' retrieving listen addresses. In order'
' for live migration to work properly you'
' must disable serial console.')
raise exception.MigrationError(reason=msg)

4
nova/virt/libvirt/guest.py
View File

@ -266,8 +266,8 @@ class Guest(object):
flags |= libvirt.VIR_DOMAIN_UNDEFINE_NVRAM
self._domain.undefineFlags(flags)
except libvirt.libvirtError:
LOG.debug("Error from libvirt during undefineFlags. %d"
"Retrying with undefine", self.id)
LOG.debug("Error from libvirt during undefineFlags for guest "
"%d. Retrying with undefine", self.id)
self._domain.undefine()
except AttributeError:
# Older versions of libvirt don't support undefine flags,