diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-11-29 11:00:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-11-29 11:00:42 +0000 |
| commit | 8d07c40932dff291a483b038d1c8836e664c2e34 (patch) | |
| tree | 0f9459b8805febb2e398d69b018cd57dd0d88f65 | |
| parent | 571e458ef82a75d00992703829df503083a2ed40 (diff) | |
| parent | a2edb3d7100d903ae4846dbd0e197ad972dc458c (diff) | |
| download | horizon-8d07c40932dff291a483b038d1c8836e664c2e34.tar.gz | |
Merge "Fix Instance Details error when using Cinder V2" into stable/juno
| -rw-r--r-- | openstack_dashboard/api/nova.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openstack_dashboard/api/nova.py b/openstack_dashboard/api/nova.py index f52472f54..312ac362a 100644 --- a/openstack_dashboard/api/nova.py +++ b/openstack_dashboard/api/nova.py @@ -711,13 +711,13 @@ def instance_volume_detach(request, instance_id, att_id): def instance_volumes_list(request, instance_id): - from openstack_dashboard.api.cinder import cinderclient # noqa + from openstack_dashboard.api import cinder volumes = novaclient(request).volumes.get_server_volumes(instance_id) for volume in volumes: - volume_data = cinderclient(request).volumes.get(volume.id) - volume.name = volume_data.display_name + volume_data = cinder.cinderclient(request).volumes.get(volume.id) + volume.name = cinder.Volume(volume_data).name return volumes |