diff options
| author | Zuul <zuul@review.opendev.org> | 2020-09-03 15:16:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-09-03 15:16:02 +0000 |
| commit | 3c80a1d0908cca869409dc3db9b5fad59d5ec33c (patch) | |
| tree | c856aad0fa620f103143dbef1ff6d82bbab361a8 | |
| parent | 1c28a88afdfd012fa8b962a25a4b75f0198ada1b (diff) | |
| parent | ff82601204e9d724b3032dc94c49fa5c8de2699b (diff) | |
| download | nova-3c80a1d0908cca869409dc3db9b5fad59d5ec33c.tar.gz | |
Merge "Removed the host FQDN from the exception message" into stable/ussuri
| -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 728137fd7b..071bfa281e 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -511,7 +511,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 6f9eeca325..603ab9925f 100644 --- a/nova/virt/libvirt/host.py +++ b/nova/virt/libvirt/host.py @@ -512,7 +512,7 @@ class Host(object): payload) compute_utils.notify_about_libvirt_connect_error( ctxt, ip=CONF.my_ip, exception=ex, tb=traceback.format_exc()) - 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 a02fe460a3..cd323ee924 100644 --- a/nova/virt/libvirt/volume/mount.py +++ b/nova/virt/libvirt/volume/mount.py @@ -86,7 +86,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: |