diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2020-09-07 19:01:30 +0200 |
|---|---|---|
| committer | Dmitry Tantsur <dtantsur@protonmail.com> | 2020-09-08 16:28:31 +0200 |
| commit | b5d5e5774c53b36819faf403b2df82590c6cc8bb (patch) | |
| tree | 030719d40a0bd716c90c7370c3c56ed03184f2b3 /ironic/tests | |
| parent | 30a9d3357770eee5642034325c0fdb6c83c87997 (diff) | |
| download | ironic-b5d5e5774c53b36819faf403b2df82590c6cc8bb.tar.gz | |
Change [agent]image_download_source=http
As part of the plan to deprecate the iSCSI deploy interface, changing
this option to a value that will work out-of-box for more deployments.
The standalone CI jobs are switched to http as well, the rest of jobs
are left with swift. The explicit indirect jobs are removed.
Change-Id: Idc56a70478dfe65e9b936006a5355d6b96e536e1
Story: #2008114
Task: #40831
Diffstat (limited to 'ironic/tests')
| -rw-r--r-- | ironic/tests/unit/drivers/modules/test_agent.py | 2 | ||||
| -rw-r--r-- | ironic/tests/unit/drivers/modules/test_deploy_utils.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ironic/tests/unit/drivers/modules/test_agent.py b/ironic/tests/unit/drivers/modules/test_agent.py index f817779c2..66b5a7bbd 100644 --- a/ironic/tests/unit/drivers/modules/test_agent.py +++ b/ironic/tests/unit/drivers/modules/test_agent.py @@ -175,6 +175,7 @@ class TestAgentMethods(db_base.DbTestCase): @mock.patch.object(deploy_utils, 'check_for_missing_params', autospec=True) def test_validate_http_provisioning_not_http(self, utils_mock): + CONF.set_override('image_download_source', 'swift', group='agent') i_info = self.node.instance_info i_info['image_source'] = '0448fa34-4db1-407b-a051-6357d5f86c59' self.node.instance_info = i_info @@ -182,7 +183,6 @@ class TestAgentMethods(db_base.DbTestCase): utils_mock.assert_not_called() def test_validate_http_provisioning_missing_args(self): - CONF.set_override('image_download_source', 'http', group='agent') CONF.set_override('http_url', None, group='deploy') i_info = self.node.instance_info i_info['image_source'] = '0448fa34-4db1-407b-a051-6357d5f86c59' diff --git a/ironic/tests/unit/drivers/modules/test_deploy_utils.py b/ironic/tests/unit/drivers/modules/test_deploy_utils.py index 85ecd46e0..0a582dee7 100644 --- a/ironic/tests/unit/drivers/modules/test_deploy_utils.py +++ b/ironic/tests/unit/drivers/modules/test_deploy_utils.py @@ -1747,6 +1747,7 @@ class TestBuildInstanceInfoForDeploy(db_base.DbTestCase): self.node = obj_utils.create_test_node(self.context, boot_interface='pxe', deploy_interface='direct') + cfg.CONF.set_override('image_download_source', 'swift', group='agent') @mock.patch.object(image_service.HttpImageService, 'validate_href', autospec=True) |