diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-27 05:19:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-27 05:19:55 +0000 |
| commit | 3dd5bb32bb62fae7aa4958dcbabd01a49b975f79 (patch) | |
| tree | 4f99fc36cad661ffcccdc91f1cd0ae43ac412f7d | |
| parent | f68d22156de6c0534a507c532ede51b9dd04946f (diff) | |
| parent | 77d33a33d662ab5ae85265f5f9c9968dc8fa8e5b (diff) | |
| download | nova-3dd5bb32bb62fae7aa4958dcbabd01a49b975f79.tar.gz | |
Merge "Don't pass the service catalog when making glance requests" into stable/juno
| -rw-r--r-- | nova/image/glance.py | 1 | ||||
| -rw-r--r-- | nova/tests/image/test_glance.py | 2 | ||||
| -rw-r--r-- | nova/tests/virt/xenapi/image/test_glance.py | 3 | ||||
| -rw-r--r-- | nova/tests/virt/xenapi/test_vm_utils.py | 3 |
4 files changed, 2 insertions, 7 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py index 98df2106f8..773cc8fe77 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -126,7 +126,6 @@ def generate_identity_headers(context, status='Confirmed'): 'X-Tenant-Id': getattr(context, 'tenant', None), 'X-Roles': ','.join(context.roles), 'X-Identity-Status': status, - 'X-Service-Catalog': jsonutils.dumps(context.service_catalog), } diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py index 675774153a..5dd16ed2a9 100644 --- a/nova/tests/image/test_glance.py +++ b/nova/tests/image/test_glance.py @@ -218,7 +218,6 @@ class TestCreateGlanceClient(test.NoDBTestCase): 'X-User-Id': 'fake', 'X-Roles': '', 'X-Tenant-Id': 'fake', - 'X-Service-Catalog': '[]', 'X-Identity-Status': 'Confirmed' }, 'token': 'token' @@ -238,7 +237,6 @@ class TestCreateGlanceClient(test.NoDBTestCase): 'X-User-Id': 'fake', 'X-Roles': '', 'X-Tenant-Id': 'fake', - 'X-Service-Catalog': '[]', 'X-Identity-Status': 'Confirmed' }, 'token': 'token' diff --git a/nova/tests/virt/xenapi/image/test_glance.py b/nova/tests/virt/xenapi/image/test_glance.py index 60486ace6d..ea851339e1 100644 --- a/nova/tests/virt/xenapi/image/test_glance.py +++ b/nova/tests/virt/xenapi/image/test_glance.py @@ -63,8 +63,7 @@ class TestGlanceStore(stubs.XenAPITestBaseNoDB): 'glance_port': 123, 'glance_use_ssl': False, 'sr_path': '/fake/sr/path', - 'extra_headers': {'X-Service-Catalog': '[]', - 'X-Auth-Token': 'foobar', + 'extra_headers': {'X-Auth-Token': 'foobar', 'X-Roles': '', 'X-Tenant-Id': 'project', 'X-User-Id': 'user', diff --git a/nova/tests/virt/xenapi/test_vm_utils.py b/nova/tests/virt/xenapi/test_vm_utils.py index 3e29bc65ef..0bff480bef 100644 --- a/nova/tests/virt/xenapi/test_vm_utils.py +++ b/nova/tests/virt/xenapi/test_vm_utils.py @@ -277,8 +277,7 @@ class FetchVhdImageTestCase(VMUtilsTestBase): self.session, 'call_plugin_serialized_with_retry') func = self.session.call_plugin_serialized_with_retry( 'glance', 'download_vhd', 0, mox.IgnoreArg(), - extra_headers={'X-Service-Catalog': '[]', - 'X-Auth-Token': 'auth_token', + extra_headers={'X-Auth-Token': 'auth_token', 'X-Roles': '', 'X-Tenant-Id': None, 'X-User-Id': None, |