summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
Diffstat (limited to 'nova')
-rw-r--r--nova/image/glance.py2
-rw-r--r--nova/tests/image/test_glance.py6
2 files changed, 1 insertions, 7 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py
index 9eea8eb4c..2a24d534e 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -435,7 +435,7 @@ def _convert_to_string(metadata):
def _limit_attributes(image_meta):
- IMAGE_ATTRIBUTES = ['size', 'location', 'disk_format',
+ IMAGE_ATTRIBUTES = ['size', 'disk_format',
'container_format', 'checksum', 'id',
'name', 'created_at', 'updated_at',
'deleted_at', 'deleted', 'status',
diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
index 2ab1897f9..5e9f9d79b 100644
--- a/nova/tests/image/test_glance.py
+++ b/nova/tests/image/test_glance.py
@@ -129,7 +129,6 @@ class TestGlanceImageService(test.TestCase):
'size': None,
'min_disk': None,
'min_ram': None,
- 'location': None,
'disk_format': None,
'container_format': None,
'checksum': None,
@@ -161,7 +160,6 @@ class TestGlanceImageService(test.TestCase):
'size': None,
'min_disk': None,
'min_ram': None,
- 'location': None,
'disk_format': None,
'container_format': None,
'checksum': None,
@@ -311,7 +309,6 @@ class TestGlanceImageService(test.TestCase):
'size': None,
'min_disk': None,
'min_ram': None,
- 'location': None,
'disk_format': None,
'container_format': None,
'checksum': None,
@@ -356,7 +353,6 @@ class TestGlanceImageService(test.TestCase):
'size': None,
'min_disk': None,
'min_ram': None,
- 'location': None,
'disk_format': None,
'container_format': None,
'checksum': None,
@@ -436,7 +432,6 @@ class TestGlanceImageService(test.TestCase):
'size': None,
'min_disk': None,
'min_ram': None,
- 'location': None,
'disk_format': None,
'container_format': None,
'checksum': None,
@@ -472,7 +467,6 @@ class TestGlanceImageService(test.TestCase):
'size': None,
'min_disk': None,
'min_ram': None,
- 'location': None,
'disk_format': None,
'container_format': None,
'checksum': None,