diff options
| author | Zuul <zuul@review.opendev.org> | 2020-10-06 02:14:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-10-06 02:14:42 +0000 |
| commit | 9dcf5ea7a0e65a125b5b552c93cb0da7c67c23e6 (patch) | |
| tree | afe58d5457d232cc0391f09a6959356ff7af62d0 | |
| parent | 2faf17995dd9daa6f0b91e44be43264e447c678d (diff) | |
| parent | 5000dcff7ee48452e86f4f43d9043cc6327faa6f (diff) | |
| download | nova-9dcf5ea7a0e65a125b5b552c93cb0da7c67c23e6.tar.gz | |
Merge "Removed the host FQDN from the exception message" into stable/pike
| -rw-r--r-- | nova/exception.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/host.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/volume/mount.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nova/exception.py b/nova/exception.py index 85fe8f8b0f..4eb436b827 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -462,7 +462,7 @@ class ComputeResourcesUnavailable(ServiceUnavailable): 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): diff --git a/nova/virt/libvirt/host.py b/nova/virt/libvirt/host.py index 10a7dabfa4..3a885d33cd 100644 --- a/nova/virt/libvirt/host.py +++ b/nova/virt/libvirt/host.py @@ -457,7 +457,7 @@ class Host(object): rpc.get_notifier('compute').error(nova_context.get_admin_context(), 'compute.libvirt.error', payload) - raise exception.HypervisorUnavailable(host=CONF.host) + raise exception.HypervisorUnavailable() return conn diff --git a/nova/virt/libvirt/volume/mount.py b/nova/virt/libvirt/volume/mount.py index 476e914932..86ace4d5c6 100644 --- a/nova/virt/libvirt/volume/mount.py +++ b/nova/virt/libvirt/volume/mount.py @@ -84,7 +84,7 @@ class _HostMountStateManager(object): with self.cond: state = self.state if state is None: - raise exception.HypervisorUnavailable(host=CONF.host) + raise exception.HypervisorUnavailable() self.use_count += 1 try: |