Merge "Removed the host FQDN from the exception message" into stable/ussuri
This commit is contained in:
commit
3c80a1d090
|
@ -511,7 +511,7 @@ class ComputeResourcesUnavailable(ServiceUnavailable):
|
||||||
|
|
||||||
|
|
||||||
class HypervisorUnavailable(NovaException):
|
class HypervisorUnavailable(NovaException):
|
||||||
msg_fmt = _("Connection to the hypervisor is broken on host: %(host)s")
|
msg_fmt = _("Connection to the hypervisor is broken on host")
|
||||||
|
|
||||||
|
|
||||||
class ComputeServiceUnavailable(ServiceUnavailable):
|
class ComputeServiceUnavailable(ServiceUnavailable):
|
||||||
|
|
|
@ -512,7 +512,7 @@ class Host(object):
|
||||||
payload)
|
payload)
|
||||||
compute_utils.notify_about_libvirt_connect_error(
|
compute_utils.notify_about_libvirt_connect_error(
|
||||||
ctxt, ip=CONF.my_ip, exception=ex, tb=traceback.format_exc())
|
ctxt, ip=CONF.my_ip, exception=ex, tb=traceback.format_exc())
|
||||||
raise exception.HypervisorUnavailable(host=CONF.host)
|
raise exception.HypervisorUnavailable()
|
||||||
|
|
||||||
return conn
|
return conn
|
||||||
|
|
||||||
|
|
|
@ -86,7 +86,7 @@ class _HostMountStateManager(object):
|
||||||
with self.cond:
|
with self.cond:
|
||||||
state = self.state
|
state = self.state
|
||||||
if state is None:
|
if state is None:
|
||||||
raise exception.HypervisorUnavailable(host=CONF.host)
|
raise exception.HypervisorUnavailable()
|
||||||
self.use_count += 1
|
self.use_count += 1
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in New Issue