15.2.5

Merge pull request #37145 from linuxbox2/octopus-rgwlc-mtime

Octopus rgwlc mtime

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>

rgwlc:  fix (post-parallel) non-current expiration

Object mtime had been lifted correctly into LCOpRule for
DMExpiration and, apparently, NonCurrentTransition, but not
for NonCurrentExpiration.

Some additional debug statements added at level 20.

Fixes: https://tracker.ceph.com/issues/47308
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

Merge pull request #36981 from neha-ojha/wip-47297-octopus

octopus: mon/OSDMonitor: only take in osd into consideration when trimming osd…

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

mon/OSDMonitor: only take in osd into consideration when trimming osdmaps

we should not take down osd into consideration when trimming osdmap. in
e62269c892, we decrease the upper bound of range of osdmaps to be trimmed
if the given osd is out. but we should have to decrease it only if the
osd in question is still *in*.

so, in this change, the min_lec is decreased only if the osd in question
is *in*.

Fixes: https://tracker.ceph.com/issues/47290
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 79175740cf2394bba74163ca8a5131419b9641ed)

 Conflicts:
src/mon/OSDMonitor.cc - trivial resolution

Merge pull request #36973 from sebastian-philipp/octopus-mgr-re-add_osd_support

octopus: Revert "mgr/osd_support: remove module and all traces"

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>

Revert "mgr/osd_support: remove module and all traces"

This reverts commit a55c1dd0fac826978edf22e448c3456e7634cbc3.

Kept to keep upgrades from older point releases working.
This module can be removed as soon as we no longer
support upgrades from old octopus point releases.

Revert "build/debian: remove osd_support"

This reverts commit 8ff2824beb78dfd03710e94302f038ea70fb4561.

Fixes: https://tracker.ceph.com/issues/47109
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 43f1bdb6ef7d740eda219bac7d0280ed558e319d)

Merge pull request #36786 from callithea/wip-46936-octopus

octopus: mgr: Add missing states to PG_STATES in mgr_module.py.

Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #36795 from ifed01/wip-ifed-simplify-pin-octopus

octopus: os/bluestore: simplify Onode pin/unpin logic

Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #36644 from smithfarm/wip-46471-octopus

octopus: rgw: stop realm reloader before store shutdown

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #36689 from rhcs-dashboard/wip-46993-octopus

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #36587 from tspmelo/wip-46907-octopus

octopus: mgr/dashboard: Extract documentation link to a component

Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #36614 from rishabh-d-dave/cv-add-tests-for-new-lvm-functions-o

octopus: ceph-volume: add tests for new functions that run LVM commands

Merge pull request #36608 from rishabh-d-dave/cv-rm-container-classes-o

octopus: ceph-volume: remove container classes from api/lvm.py

Merge pull request #36782 from callithea/wip-46974-octopus

octopus: mgr/dashboard: Strange iSCSI discovery auth behavior

Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #36831 from rhcs-dashboard/wip-47155-octopus

octopus: mgr/dashboard: redirect to original URL after successful login

Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #36661 from smithfarm/wip-46586-octopus

octopus: doc/rados: Fix osd_scrub_during_recovery default value

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #36690 from smithfarm/wip-46996-octopus

octopus: doc/mgr/crash: Add missing command in rm example

Reviewed-by: Neha Ojha <nojha@redhat.com>

mgr/dashboard: redirect to original URL after successful login

Fixes: https://tracker.ceph.com/issues/45067
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit b5359a155c6ff7e92ab6c6ed16f7ff9fc76c76ea)
(cherry picked from commit 330c75cb511d61306a8841973f2b18e17893c555)

Merge pull request #36693 from epuertat/wip-47001-octopus

octopus: mgr/dashboard/api: reduce amount of daemon logs

Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #35975 from callithea/wip-46418-octopus

octopus: mgr/dashboard: Hide password notification when expiration date is far

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>

Merge pull request #36789 from rhcs-dashboard/wip-47121-octopus

octopus: mgr/dashboard: remove "This week/month/year" and "Today" time stamps

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

Merge pull request #36635 from smithfarm/wip-46957-octopus

octopus: mgr/volumes/nfs: Add interface for adding user defined configuration

Reviewed-by: Varsha Rao <varao@redhat.com>

Merge pull request #36403 from ShyamsundarR/wip-46795-octopus

octopus: client: expose ceph.quota.max_bytes xattr within snapshots

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #36197 from smithfarm/wip-mds-fix-typo-octopus

octopus: mds/MDSRank: fix typo in "unrecognized"

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #36195 from smithfarm/wip-46591-octopus

octopus: common:  ignore SIGHUP prior to fork

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #36126 from ShyamsundarR/wip-46528-octopus

octopus: mgr/volumes: Deprecate protect/unprotect CLI calls for subvolume snapshots

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #36100 from smithfarm/wip-46536-octopus

octopus: pybind/ceph_volume_client: Fix PEP-8 SyntaxWarning

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #35962 from smithfarm/wip-46389-octopus

octopus: client: introduce timeout for client shutdown

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #36621 from smithfarm/wip-46193-octopus

octopus: os/bluestore: fix bluefs log growth

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

mgr/dashboard: remove "This week/month/year" and "Today" time stamps of Grafana in dashboard

Fixes: https://tracker.ceph.com/issues/47049
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit f76d56c45fca71ad74c53acb09b9a78f16f83734)

mgr: Add missing states to PG_STATES in mgr_module.py.

Fixes: https://tracker.ceph.com/issues/46808
Signed-off-by: Harley Gorrell <harley@panix.com>
(cherry picked from commit 5cdadf17d634e1cbd8d2b0be8c9439bc20bdbd13)

mgr/dashboard: Strange iSCSI discovery auth behavior

Disable 'autocomplete' for the user and password form fields.

Fixes: https://tracker.ceph.com/issues/46900
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 4e9c88649de2ac7ea0ad43613fe247f08a623299)

test/store_test: add missing collection reopen

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit aede2d557ab06e21fcb5b56a75cb8fbacd35a4e0)

os/bluestore: modify cache shutdown

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit fafaa0809d4c213923659aacc6f1b6b493157e73)

 Conflicts:
 trivial - src/os/bluestore/BlueStore.h

os/bluestore: fix onode count tracking in cache.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 6a28e7cba2886ff1e1b32c4713ecc472622b9835)

os/bluestore: fix pinned/cached setting in Onode::put/get

This to be squashed with HEAD~2 later, left standalone to ease
reviewing for now.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 0ef5ebcd5df38dab5cf0498ca35ed061a47b07ba)

os/bluestore: get rid off OnodeShardCache::_touch.

Onode pinning does the same for us.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 45b1db15f677b36d971909b406fc2f210a3dca7d)

os/bluestore: simplify Onode pin/unpin logic.

This patch makes in/unpin logic more straightforward and
hopefully safe in multi-threading.

Also it eliminates Onode's pin_list as one doesn't need it to track
pinned Onodes.

OnodeCacheShard reference has been removed from onode too.

cached/pinned flags have been introduced. They're accessed under cache lock
hence original race has been totally addressed.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 3a938749f352ce8e220314da9b6e344e67eaf1fd)

 Conflicts:
 trivial - src/os/bluestore/BlueStore.h

mgr/dashboard: Extract documentation link to a component

Fixes: https://tracker.ceph.com/issues/36565
Fixes: https://tracker.ceph.com/issues/43375
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit e12702a6c71d2050fe3f3991173a60332c5d583a)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-list-helper.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-501/nfs-501.component.ts
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.html
src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.ts
        src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/monitoring-list/monitoring-list.component.html
        src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/monitoring-list/monitoring-list.component.ts
        src/pybind/mgr/dashboard/frontend/src/app/shared/components/doc/doc.component.ts
        src/pybind/mgr/dashboard/frontend/src/app/shared/services/doc.service.spec.ts

rgw: hold reloader using unique_ptr

instead of using optional<> for holding reloader, use unique_ptr<>.
as `RGWRealmReloader` is neither
trivially_copy_{assignable,constructible} nor
is_trivially_move_{assignable, constructible}, because of the `Cond`
member variable. but Clang++ and libc++ still tries to rely on a
delgating copy constructor for constructing the
optional<RGWRealmReloader> instance even the optional object is
created `in_place`.

in this change, to workaround this issue, reloader is instead
constructed using make_unique<>

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 2494ddbef5ad20cdfccf59911fccadb6f9848da0)

rgw: stop realm reloader before store shutdown

otherwise the two could race to destroy the store

Fixes: https://tracker.ceph.com/issues/45969
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 7787dfb4926dcc2baa7530b620ae8cfccf90bc30)

Merge pull request #36748 from sebastian-philipp/octopus-backport-36371-36446-36349-36463-36444-36426-36447-36373-36492-36497-36538-3645

octopus: cephadm batch backport August (2)

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Varsha Rao <varao@redhat.com>

Merge pull request #36668 from smithfarm/wip-46629-octopus

octopus: bluestore: blk:BlockDevice.cc: use pending_aios instead of iovec size as ios num

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #36667 from smithfarm/wip-46964-octopus

octopus: mgr: decrease pool stats if pg was removed

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>

Merge pull request #36666 from smithfarm/wip-46934-octopus

octopus: tools/rados: Set locator key when exporting or importing a pool

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #36665 from smithfarm/wip-46739-octopus

octopus: mon: fix the 'Error ERANGE' message when conf "osd_objectstore" is filestore

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #36664 from smithfarm/wip-46722-octopus

octopus: osd/OSD.cc: remove osd_lock for bench

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>

Merge pull request #36663 from smithfarm/wip-46709-octopus

octopus: osd/PeeringState: prevent peer's num_objects going negative

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #36633 from smithfarm/wip-46951-octopus

octopus: monclient: schedule first tick using mon_client_hunt_interval

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #36643 from smithfarm/wip-46931-octopus

octopus: librados: add LIBRADOS_SUPPORTS_GETADDRS support

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #36630 from smithfarm/wip-46958-octopus

octopus: mgr/status: metadata is fetched async

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>

Merge pull request #36611 from tspmelo/wip-46924-octopus

octopus: mgr/dashboard: Unable to edit iSCSI logged-in client

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #36577 from callithea/wip-46715-octopus

octopus: mgr/diskprediction_local: Fix array size error

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #36717 from smithfarm/wip-47022-octopus

octopus: rbd: librbd: Align rbd_write_zeroes declarations

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #36678 from bk201/wip-46944-octopus

octopus: mgr/dashboard: Fix host attributes like labels are not returned

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #36581 from callithea/wip-46717-octopus

octopus: mgr/prometheus: log time it takes to collect metrics

Reviewed-by: Patrick Seidensal <pnawracay@suse.com>

Merge pull request #36302 from dillaman/wip-46724-octopus

octopus: ceph-iscsi: selinux fixes

Reviewed-by: Nathan Cutler <ncutler@suse.com>

qa/tasks/nfs: Instead of 'orch ls' use 'orch ps'

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 5c4e659067fc2022e1c226bb3c9f72fb2e018b44)

qa/suites/rados/test_orch_cli: Change mds name

As MDS name should not start with numeric digit.

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 572f0aeceb01981cab01423250cf5694404d421a)

qa/tasks/nfs: Delete nfs cluster after exports are created

Fixes: https://tracker.ceph.com/issues/47009
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 049afe5a7e6c3ccfaf29407111ff02d6ca5ee9e3)

mgr/cephadm: use fixed config file path as argument

Fixes other alertmanager containers which do not default to look for a
configuration file in `/etc/alertmanager/alertmanager.yml`.

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit cdd0ba13a5109e4319ffdaff8e8a17212e78dd15)

cephadm: fix custom alertmanager

When alertmanager image has been customized and does not have a
/etc/alertmanager directory, the uid/gid extraction fails. This change
assumes that instead the /etc/prometheus directory exists and can be
used to extract the uid and gid.

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit d218de4cde8d37f7f69a2a2a9474c0ac9afca41d)

cephadm: Allow users to use a custom dashboard ssl port

This modification allows the user to create a new bootstrap cluster using a predefined SSl port for the dashboard.
If firewall is enabled, any new manager daemon deployed in new hosts will take care of open the required ports for all the services enabled in the manager.

Two new parameters for cephadm tool (aka binary or standalone):
Command bootstrap:
--ssl-dashboard-port SSL_DASHBOARD_PORT
                      Port number used to connect with dashboard using SSL
Command deploy:
--tcp-ports TCP_PORTS
                      List of tcp ports to open in the host firewall

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit 08c4a53e79a7ed63912f765fbbf86e3364d8f9be)

mgr/cephadm: mgr or mds scale-down should prefer non-active daemons

When removing daemons during a mgr/mds scale-down, prefer to remove
standby daemons so the active daemon is not killed

Fixes: https://tracker.ceph.com/issues/44252
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 0fbf12c9d17a98bf4315b0bff81c0aeb38458e0f)

doc/cephadm: remove ssh user limitation troubleshooting

Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
(cherry picked from commit b59b480c3d6f0bcceff155c02770acb2ea842561)

python-common: ban paths from non-data-devices

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit ac5839b9f5d4ff2c4269b9da0314837cdafa5360)

docs/mgr: remove traces of ceph orch osd spec

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit f8b8e6f22900848ed12d166592f504e2d6b70554)

mgr/orchestrator: remove traces of ceph orch osd spec

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 4109e981d969c5c61f6dbf66e1e8c3c17724f5f8)

mgr/cephadm: add default osdspec_affinity to module fixture

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit eb1b37cfc34db90db86ef8449f645d5a192656b9)

mgr/cephadm: save osdspec_affinity to dd store

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 0feae8893364729f2e9b9ee9bc53b6eba66cbc10)

mgr/cephadm: add by_type daemon retrieval method

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 1f8965f8cc48c9e901f3531259d446e3d9211135)

mgr/cephadm: also mock `ceph vesions`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1c8cb204ffdb654a2b954a3d39a1c1712c151684)

mgr/cephadm: add test_upgrade.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit d71f3b42738eef2d234ec752bc27d3e8e53e744c)

mgr/cephadm/tests: move with_service to fixtures.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 50ecd89d790fb33a7dc297ae1eeb7751dd58cba2)

pybind/mgr: Also mock the config store in pytest

This will be used to dry-run mgr/cephadm/upgrade.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f44c1e71033f8f62e3bca17d274049b858e7b015)

mgr/cephadm: check existance of the RADOS pool

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 4419c18f9fb961b54715c355194b85e57804adec)

mgr/cephadm: convert py2 -> py3 type checking

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit e05bf091724e318b547967c6ec81ed5cf5807b16)

mgr/cephadm: clean-up nfs service module imports

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 4ad0636e81d1005c116ef6aae211e6fcead23ed4)

qa/tasks/cephfs/nfs: Add tests for cluster config set and reset

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit bba2d66176fa30b934aaa6fb7670cd0fecc0af78)

doc/cephfs/nfs: Update the doc about 'reset' and 'set' config interfaces

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 287da119215671fe24b371f9df01059569db4b3e)

mgr/volumes/nfs: Add interface for adding user defined configuration

Code related to creating and removing rados object has been rearranged abd
modified. This patch introduces interface to set and reset user config.

nfs cluster config set <clusterid> -i <config_file>
nfs cluster config reset <clusterid>

Fixes: https://tracker.ceph.com/issues/45747
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 9535154794c1d6d116b81c1317c48ba1aecd7581)

mgr/orch: _interface.py: PEP8tify

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit b7caeed9b694a3191f06d96339a81f5d99b0ab88)

mgr/orch: _interface.py: Convert type annotations to py3

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 0bb09324e7b4cffc957a89c3c5188bdb823176aa)

doc/cephadm: Remove shell alias

Turns out, the alias doesn't work for files.

Fixes: https://tracker.ceph.com/issues/46701
Fixes:

```
$ ceph orch apply -i myfile.yaml
ERROR: no such file or directory: myfile.yaml
```

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 75baae35288cca79a6e958c3370dba3caab813f8)

mgr/cephadm: _get_config_and_keyring: `host` is required now

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 6105d1ba4c94e1278bf38896ad467a5cf7e5b92b)

mgr/cephadm: Some more typing

Make sure we don't mix daemon names, config entities and
auth entities. Cause all of them don't mix well together.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 01e2dafb6e5b7cf3f26a63c2c66d346a1ab0bffa)

mgr/cephadm: Prevent unnecessary SSH reconfiguration

When 'set-user', 'set-pub-key' or 'set-priv-key' are called two
times with the same value, we can ignore the second call.

Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit 4cbf587b686d3b539f98b5c4cab1f0320efbe68c)

mgr/orchestrator: Update service_action() docstring

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 4d6365b6a9a9bda4375b84ad3661e43e5de9abf8)

mgr/cephadm: module.py: PEP8tify `ceph orch * ls`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit be3f513239d45feb8557f30e05fc562ce9594f51)

mgr/cephadm: Make `ceph orch * --refresh` asynchronous

There is just no way we can allow those calls to be synchornous:

* All CLI commands are blocked, till the refresh completes.
* ^C doesn't help at all, as it just kills the client

Therefore they have to be scheduled in the bg.

Fixes: https://tracker.ceph.com/issues/46813
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 7189575404262c0fbb4717f824c022d48ab58fcd)

mgr/cephadm: Refactor upgrade to call _daemon_action with new image

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 289f37d29674b9a26415147a964b1fcb26a7eaf7)

mgr/cephadm, Add --image to `ceph orch daemon redeploy <what>`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 9d0480d18b6f30f929e8599ee8b32fdc6f91aa27)

mgr/cephadm: rgw update period after realm, zone creation

Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
(cherry picked from commit 70b11a1a83d2d03062d7a2db81de8675b2f0b0f4)

mgr/cephadm: PEP8tify  upgrade.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit ffc1fd65c6b82a5565953f0da184a0b218d7ca24)

mgr/cephadm: Add UpgradeState class

My resons are:

* This increase mypy coverage
* Makes the code more discoverable.
* Allowes us to have intelligent UpgradeState properties

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 3072b1d8cbc8b5ac83697007767e12ff805a693d)

cephadm: don't add `ceph-volume lvm activate` for adopted simple OSDs

This changes the logic in deploy_daemon_units() to add either `chown` calls
for simple (ceph-disk style) OSDs, or to add `ceph-volume lvm activate` calls
for LVM OSDs, rather than always adding both.  When I was working on
https://github.com/ceph/ceph/pull/34703, I'd originally added an "osd_simple"
flag to figure out what type of OSD was being adopted/deployed, but passing
that around was kinda ugly, so was removed from that PR.  This time around
I'm checking if /etc/ceph/osd/$OSD_ID-$OSD_FSID.json.adopted-by-cephadm
exists, which seems pretty safe IMO.  My only concern with this method is:
what happens if someone adopts a simple OSD, then later wants to migrate it
to LVM.  Presumably that's a destroy and recreate, keeping the same OSD ID?
If that's true, then the JSON file probably still exists, so the subsequent
create will do the wrong thing, i.e. will add `chown` calls, not `ceph-volume
lvm activate` calls.  Any/all feedback appreciated...

Fixes: https://tracker.ceph.com/issues/46833
Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit 8112949851eb4849f0d559a118739d92051dcf8e)

mgr/caphadm/tests: Add `test_daemon_check_post`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 7d3deb2e23266ee5e206d76bb4ce33b436ac5ec2)

mgr/cephadm: Don't run `daemons_post` if _create_daemon fail

We can't run daemon_check_post for the type, if a single daemon failed.
Mainly cause `daemon_check_post` is run by service type.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit fdaa00977e3d9ee3bd1c6f5be69a0e93d6825136)

mgr/cephadm: Add test_daemon_action_fail

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f500b8fc747f1767a31e54e6fb4a9a596889d1a1)