diff options
| author | Joe Gordon <jogo@cloudscaling.com> | 2013-01-22 13:21:57 -0500 |
|---|---|---|
| committer | Joe Gordon <jogo@cloudscaling.com> | 2013-01-28 13:40:42 -0800 |
| commit | 9983d07d056f064da96fe46790573be7ff90677f (patch) | |
| tree | 4d32f01f7fc0582a6c9d858927cdd65207ab423c /nova/volume | |
| parent | f5a5ba84757a85836d78cc3d8a4f62f5ada2ac65 (diff) | |
| download | nova-9983d07d056f064da96fe46790573be7ff90677f.tar.gz nova-9983d07d056f064da96fe46790573be7ff90677f.tar.xz nova-9983d07d056f064da96fe46790573be7ff90677f.zip | |
Stop including full service catalog in each RPC msg
The service catalog is included in the context to get the cinder API
endpoints. Instead of passing entire service catalog just for cinder
endpoint, just include cinder endpoint in context.service_catalog
Change-Id: Ic39173f0a2f330dbd78daa786b269f29ac4abf33
Diffstat (limited to 'nova/volume')
| -rw-r--r-- | nova/volume/cinder.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/volume/cinder.py b/nova/volume/cinder.py index daca69854..05918f83d 100644 --- a/nova/volume/cinder.py +++ b/nova/volume/cinder.py @@ -63,8 +63,10 @@ def cinderclient(context): # FIXME: the cinderclient ServiceCatalog object is mis-named. # It actually contains the entire access blob. + # Only needed parts of the service catalog are passed in, see + # nova/context.py. compat_catalog = { - 'access': {'serviceCatalog': context.service_catalog or {}} + 'access': {'serviceCatalog': context.service_catalog or []} } sc = service_catalog.ServiceCatalog(compat_catalog) if CONF.cinder_endpoint_template: |