diff options
| author | Dan Smith <danms@us.ibm.com> | 2013-02-09 09:51:40 -0500 |
|---|---|---|
| committer | Dan Smith <danms@us.ibm.com> | 2013-02-12 09:30:44 -0500 |
| commit | e7bc52d3f2ed783864984e021eb9d676a55943c7 (patch) | |
| tree | b421fc03ee4e4ee8bf80999218fd88f437340098 | |
| parent | b64c53e0368ea63d8cd4beb71dabce9987b9bb54 (diff) | |
| download | nova-e7bc52d3f2ed783864984e021eb9d676a55943c7.tar.gz nova-e7bc52d3f2ed783864984e021eb9d676a55943c7.tar.xz nova-e7bc52d3f2ed783864984e021eb9d676a55943c7.zip | |
Fix nova-compute use of missing DBError
Apparently exception.DBError disappeared at some point, but nova-
compute was still using it. Since it was a stretch in the first
place, and nothing else in exception.py looks reasonable, this
adds exception.DBNotAllowed.
Fixes bug 1120390
Change-Id: Ifbfa0b09f3dc011ad87f6f3b06eb0fdaa7247ec0
| -rwxr-xr-x | bin/nova-compute | 2 | ||||
| -rw-r--r-- | nova/exception.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/bin/nova-compute b/bin/nova-compute index 814147d66..d99a21051 100755 --- a/bin/nova-compute +++ b/bin/nova-compute @@ -64,7 +64,7 @@ def block_db_access(): def __call__(self, *args, **kwargs): stacktrace = "".join(traceback.format_stack()) LOG.error('No db access allowed in nova-compute: %s' % stacktrace) - raise exception.DBError('No db access allowed in nova-compute') + raise exception.DBNotAllowed('nova-compute') nova.db.api.IMPL = NoDB() diff --git a/nova/exception.py b/nova/exception.py index ede512a97..0ff485f9b 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -1115,3 +1115,8 @@ class InstanceRecreateNotSupported(Invalid): class ServiceGroupUnavailable(NovaException): message = _("The service from servicegroup driver %(driver) is " "temporarily unavailable.") + + +class DBNotAllowed(NovaException): + message = _('%(binary)s attempted direct database access which is ' + 'not allowed by policy') |