Merge "Removed the host FQDN from the exception message" into stable/pike
This commit is contained in:
		@@ -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):
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user