From 54ac36e15d899c84324fb93b46ef99fd85cd91dd Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 25 Jan 2021 11:54:49 +0100 Subject: [PATCH] mgr/cephadm: enable use_repo_digest by default for pacific Signed-off-by: Sebastian Wagner --- .../rados/cephadm/upgrade/2-repo_digest/repo_digest.yaml | 2 +- src/pybind/mgr/cephadm/module.py | 4 ++-- src/pybind/mgr/cephadm/tests/test_cephadm.py | 4 +++- src/pybind/mgr/cephadm/tests/test_upgrade.py | 3 +-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/qa/suites/rados/cephadm/upgrade/2-repo_digest/repo_digest.yaml b/qa/suites/rados/cephadm/upgrade/2-repo_digest/repo_digest.yaml index 87e9e441e93..2e6bbfd921a 100644 --- a/qa/suites/rados/cephadm/upgrade/2-repo_digest/repo_digest.yaml +++ b/qa/suites/rados/cephadm/upgrade/2-repo_digest/repo_digest.yaml @@ -1,4 +1,4 @@ tasks: - cephadm.shell: mon.a: - - ceph config set mgr mgr/cephadm/use_repo_digest true --force + - ceph config set mgr mgr/cephadm/use_repo_digest false --force diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index ae79d89e378..e28d56103ce 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -304,7 +304,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule, Option( 'use_repo_digest', type='bool', - default=False, + default=True, desc='Automatically convert image tags to image digest. Make sure all daemons use the same image', ), ] @@ -350,7 +350,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule, self.registry_url: Optional[str] = None self.registry_username: Optional[str] = None self.registry_password: Optional[str] = None - self.use_repo_digest = False + self.use_repo_digest = True self._cons: Dict[str, Tuple[remoto.backends.BaseConnection, remoto.backends.LegacyModuleExecute]] = {} diff --git a/src/pybind/mgr/cephadm/tests/test_cephadm.py b/src/pybind/mgr/cephadm/tests/test_cephadm.py index f494804ea38..c26e6dd7283 100644 --- a/src/pybind/mgr/cephadm/tests/test_cephadm.py +++ b/src/pybind/mgr/cephadm/tests/test_cephadm.py @@ -963,10 +963,12 @@ class TestCephadm(object): True ]) def test_upgrade_run(self, use_repo_digest, cephadm_module: CephadmOrchestrator): + cephadm_module.use_repo_digest = use_repo_digest + with with_host(cephadm_module, 'test', refresh_hosts=False): cephadm_module.set_container_image('global', 'image') + if use_repo_digest: - cephadm_module.use_repo_digest = True CephadmServe(cephadm_module).convert_tags_to_repo_digest() diff --git a/src/pybind/mgr/cephadm/tests/test_upgrade.py b/src/pybind/mgr/cephadm/tests/test_upgrade.py index a965bdf81ae..88b5c939a27 100644 --- a/src/pybind/mgr/cephadm/tests/test_upgrade.py +++ b/src/pybind/mgr/cephadm/tests/test_upgrade.py @@ -36,8 +36,7 @@ def test_upgrade_run(use_repo_digest, cephadm_module: CephadmOrchestrator): with with_host(cephadm_module, 'host1'): with with_host(cephadm_module, 'host2'): cephadm_module.set_container_image('global', 'from_image') - if use_repo_digest: - cephadm_module.use_repo_digest = True + cephadm_module.use_repo_digest = use_repo_digest with with_service(cephadm_module, ServiceSpec('mgr', placement=PlacementSpec(host_pattern='*', count=2)), CephadmOrchestrator.apply_mgr, ''),\ mock.patch("cephadm.module.CephadmOrchestrator.lookup_release_name", return_value='foo'),\ -- 2.39.5