Drop ineffective options from config file

The following options set in functional tests do not exist.
 [DEFAULT] send_identity_credentials
 [DEFAULT] send_identity_headers

Change-Id: Ia739af13e0f88d0861e453a4d54ecc626e32b34b

glance/tests/functional/__init__.py

@@ -107,7 +107,6 @@ class BaseServer(metaclass=abc.ABCMeta):
         self.process_pid = None
         self.server_module = None
         self.stop_kill = False
-        self.send_identity_credentials = False
 
     def write_conf(self, **kwargs):
         """
@@ -420,8 +419,6 @@ class ApiServer(Server):
         self.location_strategy = 'location_order'
         self.store_type_location_strategy_preference = ""
 
-        self.send_identity_headers = False
-
         self.node_staging_uri = 'file://%s' % os.path.join(
             self.test_dir, 'staging')
 
@@ -431,13 +428,11 @@ default_log_levels = eventlet.wsgi.server=DEBUG,stevedore.extension=INFO
 bind_host = %(bind_host)s
 bind_port = %(bind_port)s
 metadata_encryption_key = %(metadata_encryption_key)s
-send_identity_credentials = %(send_identity_credentials)s
 log_file = %(log_file)s
 image_size_cap = %(image_size_cap)d
 delayed_delete = %(delayed_delete)s
 workers = %(workers)s
 scrub_time = %(scrub_time)s
-send_identity_headers = %(send_identity_headers)s
 image_cache_dir = %(image_cache_dir)s
 image_cache_driver = %(image_cache_driver)s
 show_image_direct_url = %(show_image_direct_url)s
@@ -614,21 +609,17 @@ class ApiServerForMultipleBackend(Server):
         self.location_strategy = 'location_order'
         self.store_type_location_strategy_preference = ""
 
-        self.send_identity_headers = False
-
         self.conf_base = """[DEFAULT]
 debug = %(debug)s
 default_log_levels = eventlet.wsgi.server=DEBUG,stevedore.extension=INFO
 bind_host = %(bind_host)s
 bind_port = %(bind_port)s
 metadata_encryption_key = %(metadata_encryption_key)s
-send_identity_credentials = %(send_identity_credentials)s
 log_file = %(log_file)s
 image_size_cap = %(image_size_cap)d
 delayed_delete = %(delayed_delete)s
 workers = %(workers)s
 scrub_time = %(scrub_time)s
-send_identity_headers = %(send_identity_headers)s
 image_cache_dir = %(image_cache_dir)s
 image_cache_driver = %(image_cache_driver)s
 show_image_direct_url = %(show_image_direct_url)s
@@ -787,8 +778,6 @@ class ScrubberDaemon(Server):
         self.policy_file = policy_file
         self.policy_default_rule = 'default'
 
-        self.send_identity_headers = False
-
         self.conf_base = """[DEFAULT]
 debug = %(debug)s
 log_file = %(log_file)s

glance/tests/functional/serial/test_scrubber.py

@@ -38,7 +38,6 @@ class TestScrubber(functional.FunctionalTest):
     def setUp(self):
         super(TestScrubber, self).setUp()
         self.api_server.deployment_flavor = 'noauth'
-        self.api_server.send_identity_credentials = True
         self.admin_context = context.get_admin_context(show_deleted=True)
         CONF.set_override('connection', self.api_server.sql_connection,
                           group='database')

glance/tests/functional/test_cache_middleware.py

@@ -398,7 +398,6 @@ class TestImageCacheSqlite(functional.FunctionalTest,
         super(TestImageCacheSqlite, self).setUp()
 
         self.api_server.deployment_flavor = "caching"
-        self.api_server.send_identity_credentials = True
 
     def tearDown(self):
         super(TestImageCacheSqlite, self).tearDown()

glance/tests/functional/test_cors_middleware.py

@@ -34,7 +34,6 @@ class TestCORSMiddleware(functional.FunctionalTest):
         super(TestCORSMiddleware, self).setUp()
         # Cleanup is handled in teardown of the parent class.
         self.api_server.deployment_flavor = "caching"
-        self.api_server.send_identity_credentials = True
         self.start_servers(**self.__dict__.copy())
         self.http = httplib2.Http()
         self.api_path = "http://%s:%d/v2/images" % ("127.0.0.1", self.api_port)

glance/tests/functional/test_wsgi.py

@@ -67,7 +67,6 @@ class TestWSGIServer(functional.FunctionalTest):
 class StagingCleanupBase:
     def _configure_api_server(self):
         self.my_api_server.deployment_flavor = 'noauth'
-        self.my_api_server.send_identity_credentials = True
 
     def _url(self, path):
         return 'http://127.0.0.1:%d%s' % (self.api_port, path)

glance/tests/functional/v2/test_images.py

@@ -72,7 +72,6 @@ class TestImages(functional.FunctionalTest):
                                                "foo_image%d" % i)
             setattr(self, 'http_server%d' % i, ret[1])
             setattr(self, 'http_port%d' % i, ret[2])
-        self.api_server.send_identity_credentials = True
 
     def tearDown(self):
         for i in range(3):
@@ -3740,7 +3739,6 @@ class TestImagesIPv6(functional.FunctionalTest):
         # Image list should be empty
 
         self.api_server.deployment_flavor = "caching"
-        self.api_server.send_identity_credentials = True
         self.start_servers(**self.__dict__.copy())
 
         url = f'http://[::1]:{self.api_port}'