Removed the host FQDN from the exception message

Deletion of an instance after disabling the hypervisor by a non-admin
 user leaks the host fqdn in fault msg of instance.Removing the
'host' field from the error message of HypervisorUnavaiable
cause it's leaking host fqdn to non-admin users. The admin user will
see the Hypervisor unavailable exception msg but will be able to figure
on which compute host the guest is on and that the connection is broken.

Change-Id: I0eae19399670f59c17c9a1a24e1bfcbf1b514e7b
Closes-Bug: #1851587
(cherry picked from commit a89ffab832)
(cherry picked from commit ff82601204)
(cherry picked from commit c5abbd17b5)
This commit is contained in:
Praharshitha Metla 2020-07-30 16:30:06 +05:30 committed by melanie witt
parent 042dc4f270
commit d5ff9f87c8
3 changed files with 3 additions and 3 deletions

View File

@ -521,7 +521,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):

View File

@ -479,7 +479,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

View File

@ -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: