From c342c0e944126c6d257fab8910477a58bdec5da7 Mon Sep 17 00:00:00 2001 From: Erno Kuvaja Date: Fri, 26 Aug 2022 12:16:06 +0100 Subject: [PATCH] Remove 'glance-download' from default import methods As 'glance-download' requires federated deployments it should not be enabled by default. Added line explaining it being available for such deployments in the config help text. Change-Id: Icc792e23aad9e7a9a788e6b5826bc5aae54ae978 --- glance/common/config.py | 3 ++- glance/tests/unit/v2/test_discovery_image_import.py | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/glance/common/config.py b/glance/common/config.py index 07345978a7..dd7e1b6e9f 100644 --- a/glance/common/config.py +++ b/glance/common/config.py @@ -572,11 +572,12 @@ Related options: item_type=cfg.types.String(quotes=True), bounds=True, default=['glance-direct', 'web-download', - 'copy-image', 'glance-download'], + 'copy-image'], help=_(""" List of enabled Image Import Methods 'glance-direct', 'copy-image' and 'web-download' are enabled by default. + 'glance-download' is available, but requires federated deployments. Related options: * [DEFAULT]/node_staging_uri""")), diff --git a/glance/tests/unit/v2/test_discovery_image_import.py b/glance/tests/unit/v2/test_discovery_image_import.py index 949da8c077..337fa1ba70 100644 --- a/glance/tests/unit/v2/test_discovery_image_import.py +++ b/glance/tests/unit/v2/test_discovery_image_import.py @@ -33,12 +33,12 @@ class TestInfoControllers(test_utils.BaseTestCase): self.assertEqual([], output['import-methods']['value']) def test_get_import_info(self): - # TODO(rosmaita): change this when import methods are - # listed in the config file - import_methods = ['glance-direct', 'web-download', - 'copy-image', 'glance-download'] + """Testing defaults, not all possible values""" + default_import_methods = ['glance-direct', 'web-download', + 'copy-image'] req = unit_test_utils.get_fake_request() output = self.controller.get_image_import(req) self.assertIn('import-methods', output) - self.assertEqual(import_methods, output['import-methods']['value']) + self.assertEqual(default_import_methods, + output['import-methods']['value'])