local variable 'service_catalog' referenced before assignment

[yong sheng gong]

2012-07-04 09:31:47 ERROR nova.api.openstack [-] Caught error: local variable 'service_catalog' referenced before assignment
2012-07-04 09:31:47 TRACE nova.api.openstack Traceback (most recent call last):
2012-07-04 09:31:47 TRACE nova.api.openstack File "/root/test/git/nova/nova/api/openstack/__init__.py", line 41, in __call__
2012-07-04 09:31:47 TRACE nova.api.openstack return req.get_response(self.application)
2012-07-04 09:31:47 TRACE nova.api.openstack File "/usr/lib/python2.6/site-packages/webob/request.py", line 1053, in get_response
2012-07-04 09:31:47 TRACE nova.api.openstack application, catch_exc_info=False)
2012-07-04 09:31:47 TRACE nova.api.openstack File "/usr/lib/python2.6/site-packages/webob/request.py", line 1022, in call_application
2012-07-04 09:31:47 TRACE nova.api.openstack app_iter = application(self.environ, start_response)
2012-07-04 09:31:47 TRACE nova.api.openstack File "/usr/lib/python2.6/site-packages/webob/dec.py", line 159, in __call__
2012-07-04 09:31:47 TRACE nova.api.openstack return resp(environ, start_response)
2012-07-04 09:31:47 TRACE nova.api.openstack File "/root/test/git/keystone/keystone/middleware/auth_token.py", line 176, in __call__
2012-07-04 09:31:47 TRACE nova.api.openstack return self.app(env, start_response)
2012-07-04 09:31:47 TRACE nova.api.openstack File "/usr/lib/python2.6/site-packages/webob/dec.py", line 147, in __call__
2012-07-04 09:31:47 TRACE nova.api.openstack resp = self.call_func(req, *args, **self.kwargs)
2012-07-04 09:31:47 TRACE nova.api.openstack File "/usr/lib/python2.6/site-packages/webob/dec.py", line 208, in call_func
2012-07-04 09:31:47 TRACE nova.api.openstack return self.func(req, *args, **kwargs)
2012-07-04 09:31:47 TRACE nova.api.openstack File "/root/test/git/nova/nova/api/auth.py", line 110, in __call__
2012-07-04 09:31:47 TRACE nova.api.openstack service_catalog=service_catalog)
2012-07-04 09:31:47 TRACE nova.api.openstack UnboundLocalError: local variable 'service_catalog' referenced before assignment

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/9308

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/9308
Committed: http://github.com/openstack/nova/commit/dab6261216dab3879c45c4e89f29627a16d8db1a
Submitter: Jenkins
Branch: master

commit dab6261216dab3879c45c4e89f29627a16d8db1a
Author: Dan Prince <email address hidden>
Date: Tue Jul 3 23:15:06 2012 -0400

    Assign service_catalog in NovaKeystoneContext.

    Updates NovaKeystoneContext so that the service_catalog variable is
    assigned regardless of whether X_SERVICE_CATALOG is set.

    Fixes LP Bug #1020779
    Change-Id: I3ab15fa53488f2f352718fd230d8ec5e3a38cf56