diff --git a/nova/image/glance.py b/nova/image/glance.py index ac733e86ad3c..58c6c2763ada 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -116,7 +116,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/unit/image/test_glance.py b/nova/tests/unit/image/test_glance.py index 840097c46c76..a9c3c1476430 100644 --- a/nova/tests/unit/image/test_glance.py +++ b/nova/tests/unit/image/test_glance.py @@ -206,7 +206,6 @@ class TestCreateGlanceClient(test.NoDBTestCase): 'X-User-Id': 'fake', 'X-Roles': '', 'X-Tenant-Id': 'fake', - 'X-Service-Catalog': '[]', 'X-Identity-Status': 'Confirmed' }, 'token': 'token' @@ -226,7 +225,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/unit/virt/xenapi/image/test_glance.py b/nova/tests/unit/virt/xenapi/image/test_glance.py index 0189b201f6a3..044e413213e0 100644 --- a/nova/tests/unit/virt/xenapi/image/test_glance.py +++ b/nova/tests/unit/virt/xenapi/image/test_glance.py @@ -65,8 +65,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/unit/virt/xenapi/test_vm_utils.py b/nova/tests/unit/virt/xenapi/test_vm_utils.py index 34e0f0eac3f8..edae8509ecca 100644 --- a/nova/tests/unit/virt/xenapi/test_vm_utils.py +++ b/nova/tests/unit/virt/xenapi/test_vm_utils.py @@ -283,8 +283,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(), 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,