Merge "Removed the host FQDN from the exception message" into stable/rocky
This commit is contained in:
commit
ac944cca5f
|
@ -505,7 +505,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):
|
||||||
|
|
|
@ -466,7 +466,7 @@ class Host(object):
|
||||||
rpc.get_notifier('compute').error(nova_context.get_admin_context(),
|
rpc.get_notifier('compute').error(nova_context.get_admin_context(),
|
||||||
'compute.libvirt.error',
|
'compute.libvirt.error',
|
||||||
payload)
|
payload)
|
||||||
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