]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: Add client.admin keyring when upgrading from older version
authorSebastian Wagner <sewagner@redhat.com>
Mon, 13 Sep 2021 14:03:02 +0000 (16:03 +0200)
committerSebastian Wagner <sewagner@redhat.com>
Tue, 18 Jan 2022 10:21:27 +0000 (11:21 +0100)
commit48fb4dab3cae3a4138c0c7a7d6e6d53331c0c720
tree555c0da8e54f3762ef0f1ddbbceabe6803b67bc9
parentad2a2f9569e33464053f33657694025d39981aa8
mgr/cephadm: Add client.admin keyring when upgrading from older version

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 02c942a093a28376301b9b4c66d9c712345ff953)

Conflicts:
src/pybind/mgr/cephadm/tests/test_migration.py
qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.yaml
src/pybind/mgr/cephadm/migrations.py
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/tests/fixtures.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/cephadm/tests/test_migration.py