From ead78d55f1b0d2267629948e82b51f1ab3e6bf82 Mon Sep 17 00:00:00 2001
From: Alex Meade <alex.meade@rackspace.com>
Date: Thu, 3 May 2012 14:29:50 -0400
Subject: [PATCH] Replaces exceptions.Error with NovaException
Fixes bug 817107
Change-Id: I6253e6bbcc44676c587b315fa32afba6459e676a
---
nova/virt/baremetal/nodes.py | 2 +-
nova/virt/baremetal/tilera.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/nova/virt/baremetal/nodes.py b/nova/virt/baremetal/nodes.py
index f78eaf74..c3c80655 100644
--- a/nova/virt/baremetal/nodes.py
+++ b/nova/virt/baremetal/nodes.py
@@ -39,4 +39,4 @@ def get_baremetal_nodes():
elif d == 'fake':
return fake.get_baremetal_nodes()
else:
- raise exception.Error(_("Unknown baremetal driver %(d)s"))
+ raise exception.NovaException(_("Unknown baremetal driver %(d)s"))
diff --git a/nova/virt/baremetal/tilera.py b/nova/virt/baremetal/tilera.py
index c92d9b21..9231e8f7 100644
--- a/nova/virt/baremetal/tilera.py
+++ b/nova/virt/baremetal/tilera.py
@@ -325,7 +325,7 @@ class BareMetalNodes(object):
return power_state.RUNNING
except Exception as ex:
self.deactivate_node(node_id)
- raise exception.Error(_("Node is unknown error state."))
+ raise exception.NovaException(_("Node is unknown error state."))
def get_console_output(self, console_log, node_id):
"""