ceph-volume: fix lvm functional tests

This is related to https://github.com/ceph/ceph-ansible/pull/5413 and
adjusts the tests to work with the related ansible fix.

Fixes: https://tracker.ceph.com/issues/46131
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit a0134bb06508738e83456af7e440f418153053b0)

Merge pull request #36247 from dillaman/wip-46674

octopus: librbd: new 'write_zeroes' API methods to suppliment the `discard` APIs

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #35995 from tchaikov/octopus-46408

octopus: mgr: avoid false alarm of MGR_MODULE_ERROR

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

Merge pull request #35957 from smithfarm/wip-46372-octopus

octopus: osd: expose osdspec_affinity to osd_metadata

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #35893 from callithea/wip-46214-octopus

octopus: mgr/dashboard: Add host labels in UI

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>

Merge PR #36224 into octopus

* refs/pull/36224/head:
mgr/nfs: Remove NParts and Cache_Size from MDCACHE block
doc/cephfs/nfs: Update about deploying nfs-ganesha with cephadm in vstart

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #36265 from sebastian-philipp/octopus-backport-35955-35709-35744-35991-35838-35471-35862-35901-35456-35846-36152-3599

octopus: cephadm batch backport July (3)

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge pull request #36160 from rhcs-dashboard/wip-46602-octopus

octopus: mgr/dashboard: fix ui api endpoints

Reviewed-by: Fabrizio D'Angelo <fdangelo@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

cephadm: fix UnboundLocalError: `container_path`

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

cephadm: remove ktdreyer's copr repository

This was needed as a temporary solution until all missing EL8 packages
are built on EPEL 8.
Because we now have all dependencies on EPEL 8 then we can remove that
repository.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 4cf99eb68e5c5e7e2423905dd83684b03e80b99b)

cephadm: Fix ipv6 network regex to support routes with expiry

The regex I previously added didn't take into account ipv6 networks that
had an expiry, this patch updates the regex and includes an ipv6 route
version in the test.

Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit f4a986cbffccbf00b499d2d0546ac4623c12ddad)

mgr/osd_support: add unittests

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

ceph: Fix `tell` for cephadm

The tell target might contain dots now. Like
`mds.myfs.myhost.rnusmq` is now a valid
target.

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

cephadm: also retry on digest mismatch

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

cephadm: Retry pull on transient error

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

mgr/cephadm: clean-up service module type checking

mypy cast to avoid:

cephadm/module.py: note: In member "_config_fn" of class "CephadmOrchestrator":
cephadm/module.py:1797: error: Incompatible return value type (got "Optional[function]", expected "Optional[Callable[[ServiceSpec], None]]")

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

mgr/cephadm: assert the service_type during config/create

ensure the passed ServiceSpec type matches the CephadmService type

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

mgr/cephadm: clean-up service module type checking

- convert to py3 style type checks
- other misc type checking fixups

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

mgr/cephadm: clean-up service module type checking

- add return type to `config` func
- add missing `NFSServiceSpec` annotation to `config` func

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

mgr/cephadm: clean-up service module type checking

- add missing return type to `create` func

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

cephadm: fix indentation

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

cephadm: remove unused/commented out code

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

cephadm: fix creating custom Prometheus image

Fix the code by improving a condition where a zero as uid or gid leads
to an additional attempt to extract the uid/gid instead of uid/gid
simply being used correctly.

Fixes: https://tracker.ceph.com/issues/46398
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 3c98f1553fe3b91777ee81d887d02462132475fb)

mgr/cephadm: Add CEPHADM_PAUSED to test_cli

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

mgr/cephadm: Set exception context to populate orch events.

Like when if daemon deployment fails

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

mgr/cephadm: Add event when deploying a daemon

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

mgr/cephadm: Add an event when creating a service

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

mgr/cephadm: Add inventory.EventStore

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

mgr/orch: Add events to tests/test_orchestrator

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

mgr/orch: Add OrchestratorEvent class

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

vstart: Remove old ceph images if new cluster is deployed

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

cephadm: refactor update_firewalld

* split into three different methods
* untangle service and port lists

This helps in making our firewall handling more dynamic.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Co-authored-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit 4f341819ec746d0a04b76e88b84b64158905e5b6)

mgr/cephadm: check-host should not fail as hard using fqdn

Print error message instead of traceback when check-host
fails in due to host address not being found

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

mgr/cephadm: Add test for _check_daemons()

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

mgr/cephadm: refactor `_create_daemon()`

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

mgr/cephadm: Add CephadmDaemonSpec class

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

python-common: RGW service_id might not contain a zone

also adds missing RGWSpec.validate()

Fixes: https://tracker.ceph.com/issues/46268
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit b54a800b748dc94cb847cc44e23b481c8c3a85b4)

doc/cephadm: remove a confusing sentence fragment

Removed a confusing sentence fragment: "For each file system:"

Fixes: https://tracker.ceph.com/issues/46546
Signed-off-by: Zac Dover <zac.dover@gmail.com>
Co-authored-by: Varsha <rvarsha016@gmail.com>
(cherry picked from commit dcce296eea99fa025135d68f079008421de14fa3)

mgr/cephadm: Adapt Vagrantbox to el8

After el7 has been dropped with https://github.com/ceph/ceph/pull/35722 the Vagrantbox need to be adapted to el8.

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit d8623ff67bb57ecb3e7b0ae814ea21f1fda54c9b)

Conflicts:
src/pybind/mgr/cephadm/Vagrantfile

doc/mgr/orchestrator: Add information about unmanaged parameter

Explain parameter 'unmanaged' in OSDs creation and deletion

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

doc/cephadm: add yaml infor for orch apply mon

This commit breaks one of the long sentences into
three shorter sentences, and adds a parenthetical
comment walking the reader through a series of commands,
explaining what each command does and why only the last
of the commands ends up having a lasting effect on the Ceph
environment.

Fixes: https://tracker.ceph.com/issues/46133
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit b02c98bfa5f0ebe442abd97fab16d65b0ebfbf83)

mgr/cephadm: do not accept filestore osds in osdspecs

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

doc: add note about filter_logic

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

python-common/drivegroups: implement option to change filter_logic

Filters are applied to disks using an AND gate by default. In some
scenarios you can only achieve the desired behavior when using an OR
gate without expanding the available filters.

This patch allows to switch between `AND` and `OR` gates.

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

mgr/cephadm: also list vendor/model/rotational in device ls

Fixes: https://tracker.ceph.com/issues/45872
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 7c18893f94b01f10aa35ebcec13ee3a3a785c94a)

Merge pull request #35880 from ceph/wip-octopus-34744

octopus: ceph-volume: handle idempotency with batch and explicit scenarios

rbd: use new 'write_zeroes' API to ensure zeroed extents will be zeroed

Fixes: https://tracker.ceph.com/issues/45986
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f319ecfbec3486917824eab84ab76347319b8bde)

pybind/rbd: add new write_zeroes/aio_write_zeroes API methods

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c27d744a339d3644b756ee496445909f63c8903e)

librbd: add 'write_zeroes' public C/C++ API methods

Unlike the existing 'discard' option which is more of a hint to
attempt to release space, the new 'write_zeroes' APIs will ensure
that the entire provided extent is fully zeroed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit ae6dd86b22e928dc23a385faf41cf76b0d293576)

Conflicts:
src/librbd/api/Io.h/cc: logic exists in ImageRequestWQ files
src/librbd/librbd.cc: trivial resolution due missing api::Io
src/test/librbd/test_librbd.cc: trivial resolution

Merge pull request #36137 from rhcs-dashboard/wip-46570-octopus

octopus: mgr/dashboard: fix pool usage calculation

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

Merge pull request #36049 from smithfarm/wip-46009-octopus

octopus: tests: objectstore/store_test: kill ExcessiveFragmentation test case.

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

Merge pull request #36048 from smithfarm/wip-46015-octopus

octopus: common: log: fix timestap precision of log can't set to millisecond.

Reviewed-by: Adam Emerson <aemerson@redhat.com>

Merge pull request #36037 from smithfarm/wip-46489-octopus

octopus: pybind/mgr/pg_autoscaler/module.py: do not update event if ev.pg_num== ev.pg_num_target

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

Merge pull request #36036 from smithfarm/wip-46460-octopus

octopus: pybind/mgr/balancer: use "==" and "!=" for comparing str

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

mgr/nfs: Remove NParts and Cache_Size from MDCACHE block

As setting them to small value affects the performance and they are not related
to metadata caching. https://review.gerrithub.io/c/ffilz/nfs-ganesha/+/495185

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

doc/cephfs/nfs: Update about deploying nfs-ganesha with cephadm in vstart

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

Merge pull request #35889 from s0nea/wip-46328-octopus

octopus: mgr/dashboard: remove cdCopy2ClipboardButton `formatted` attribute

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #36076 from smithfarm/wip-46514-octopus

octopus: mgr/progress: Skip pg_summary update if _events dict is empty.

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

Merge pull request #36085 from smithfarm/wip-46511-octopus

octopus:  rgw: lc: fix Segmentation Fault when the tag of the object was not found

Reviewed-by: Friedmann <ofriedma@redhat.com>

Merge pull request #36028 from smithfarm/wip-46467-octopus

octopus: rgw: radoslist incomplete multipart uploads fix marker progression

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

Merge pull request #36027 from smithfarm/wip-46459-octopus

octopus: rgw: orphan list teuthology test & fully-qualified domain issue

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

Merge pull request #36025 from smithfarm/wip-46005-octopus

octopus: rgw: add check for index entry's existing when adding bucket stats during bucket reshard.

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

Merge pull request #36024 from smithfarm/wip-45951-octopus

octopus: rgw: add access log to the beast frontend

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

Merge pull request #36023 from smithfarm/wip-45933-octopus

octopus: rgw: Add subuser to OPA request

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

Merge pull request #36022 from smithfarm/wip-45931-octopus

octopus: rgw: Add support wildcard subuser for bucket policy

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

Merge pull request #36021 from smithfarm/wip-45928-octopus

octopus: rgw: fix loop problem with swift stat on account.

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

Merge pull request #36020 from smithfarm/wip-45926-octopus

octopus: rgw: add quota enforcement to CopyObj

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

Merge pull request #36019 from smithfarm/wip-45924-octopus

octopus: rgw: bucket list/stats truncates for user w/ >1000 buckets

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

Merge pull request #36017 from smithfarm/wip-45913-octopus

octopus: rgw: cls/rgw_gc: Fixing the iterator used to access urgent data map

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

mgr/dashboard: Fix doc endpoints

UiApi endpoints were broken because the same base URL was used for
both UiApi and Api endpoints.

There were two issues with this:

- The paths dict keys were based off a string split of path that
  used base URL length. This caused the wrong keys to be created and the
duplicate apiapi seen in the cURL requests generated by OpenAPI.
- Fixing the above issue was not enough, as then both Api and UiApi
  endpoints would have the same base URL. This causes conflicts with doc
generation that result in only UiApi endpoints to be generated.

Passing only / as the base URL argument for api_json and
api_all_json and using the full path as the paths keys solves this
issue.

Other changes:

* base_url variable was removed from  controllers/docs.py:_gen_paths
  and tests/test_docs.py because it was unused after my change.

* Added type hints for dicts in controllers/docs.py and
  controllers/pool.py because they were not passing mypy checks.

* test_docs.py unit test added to verify change

* Add message which explains that UiApi endpoints are not part of the
public api

Fixes: https://tracker.ceph.com/issues/45957
Signed-off-by: Fabrizio D'Angelo <fdangelo@redhat.com>
(cherry picked from commit d1a5300a6e778d8fca5befbc2023df0f5c3ead03)

Merge pull request #36046 from smithfarm/wip-46469-octopus

octopus: cephfs: client: release the client_lock before copying data in read

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

Merge pull request #36045 from smithfarm/wip-46410-octopus

octopus: cephfs: client: fix setxattr for 0 size value (NULL value)

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

Merge pull request #36044 from smithfarm/wip-46348-octopus

octopus: tests: qa/tasks: make sh() in vstart_runner.py identical with teuthology.orchestra.remote.sh

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

Merge pull request #36043 from smithfarm/wip-46311-octopus

octopus: tests: qa/tasks/cephfs/cephfs_test_case.py: skip cleaning the core dumps when in program case

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

Merge pull request #36042 from smithfarm/wip-46199-octopus

octopus: tests: Revert "Revert "qa/suites/rados/mgr/tasks/module_selftest: whitelist …

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

Merge pull request #36040 from smithfarm/wip-46188-octopus

octopus: mds: reset heartbeat in EMetaBlob replay

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

Merge pull request #36039 from smithfarm/wip-46186-octopus

octopus: cephfs: client: fix snap directory atime

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

Merge pull request #36038 from smithfarm/wip-46152-octopus

octopus: mds: do not defer incoming mgrmap when mds is laggy

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

Merge pull request #36035 from smithfarm/wip-46286-octopus

octopus: mon/MDSMonitor: copy MDS info which may be removed

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

Merge pull request #35842 from Vicente-Cheng/wip-46190-octopus

octopus: mds: fix filelock state when Fc is issued

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

Merge pull request #36109 from sebastian-philipp/octopus-backport-35890-35913-35908-35927-35813-35717-35990-35915-35747-36013

octopus: cephadm batch backport July (2)

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>

Merge pull request #35819 from bk201/wip-46197-octopus

octopus: mgr/dashboard: fix Source column i18n issue in RBD configuration tables

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

mgr/dashboard: fix pool usage calculation

Currently Dashboard Pool usage calculation does not match the output of
'ceph df' command.

Fixes: https://tracker.ceph.com/issues/45185
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit b4a9dc17a3de90379964443d26b29f1759824f28)

Conflicts:
qa/tasks/mgr/dashboard/test_pool.py: relative import
src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.html: change place of new chunk

Merge pull request #36073 from rhcs-dashboard/wip-46354-octopus

octopus: mgr/dashboard: fix backporting issue #35926

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

Merge pull request #35997 from ricardoasmarques/wip-46436-octopus

octopus: mgr/dashboard: Allow to edit iSCSI target with active session

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

Merge pull request #35684 from smithfarm/wip-46121-octopus

octopus: mgr/k8sevents: sanitise kubernetes events

Merge pull request #35958 from callithea/wip-46394-octopus

octopus: mon/PGMap: do not consider changing pg stuck

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

cephadm: Make Vagrantfile more flexible

Now you can use a JSON or pass multiple variable to vagrant in order to
configure the outcome of VMs you get. Similar to vstart.sh you can use
OSDS, MGRS and MONS as arguments to pass. As OSDS behave a bit different
in this scenario you can also specify the amount of extra disks and OSD
VM has.

Fixes: https://tracker.ceph.com/issues/46376
Signed-off-by: Stephan Müller <smueller@suse.com>
(cherry picked from commit c767a0c0e8ffed4448e4d2cacef72674e7ada883)

mgr/cephadm: allow custom dashboard grafana url

Instead of resetting grafana url to a default with
each run of the service loop, only set it when
initally deployed or when it's placement changes

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

mgr/rook: Fix error creating OSDs

https://github.com/ceph/ceph/pull/34860 broke Rook Integration tests (Rook orchestrator module)

This fix the error that can be seen in:
https://jenkins.rook.io/blue/rest/organizations/jenkins/pipelines/rook/pipelines/rook/branches/master/runs/2046/nodes/63/steps/121/log/?start=0

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

cephadm: Fix Python formating issues

Fix obvious Python formating errors reported by my IDE.

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 906fa6da4a602d097b740a4d0146bef2d8dd5c59)

Conflicts:
src/cephadm/cephadm

doc/dev/cephadm.rst: clarify, fix spelling nits

Signed-off-by: Dan Mick <dmick@redhat.com>
(cherry picked from commit d108444fedeffd9f2268e5277af58f2b1030aa33)

vstart.sh: use output of hostname for cephadm

Otherwise I get this error on a dev machine:

        /home/pdonnell/ceph/build/bin/ceph -c /home/pdonnell/ceph/build/ceph.conf -k /home/pdonnell/ceph/build/keyring orch host add senta03
        Error ENOENT: New host senta03 (senta03) failed check: ['INFO:cephadm:podman|docker (/bin/podman) is present', 'INFO:cephadm:systemctl is present', 'INFO:cephadm:lvcreate is present', 'INFO:cephadm:Unit chronyd.service is enabled and running', 'INFO:cephadm:Hostname "senta03" matches what is expected.', 'ERROR: hostname "senta03.front.sepia.ceph.com" does not match expected hostname "senta03"']

If `hostname` is configured to give the fqdn, we get the above error
from cephadm.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 4aba413337e4f9041ade9b5b9e9daee9a08eb419)

qa/tasks: fix cephadm config image check

Check container_image_name only if ceph cluster image is not pre-defined in config.
We shouldn't care about container_image_name if there cephadm or ceph already have image defined.

Signed-off-by: Georgios Kyratsas <gkyratsas@suse.com>
(cherry picked from commit 390ca4d92fe2e0467eec9161de1b7bdc1c62891f)

mgr/cephadm: fix Dashboard ganesha setting duplication error

Fix the problem when there are multiple daemons in a NFS service,
redundant Ganesha locations are set.

This change also fixes the setting is wrong when no namespace is used for
a Ganesha config pool.

Fixes: https://tracker.ceph.com/issues/46329
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit c233ef9099685276de39e799469aebfcb438b1ea)

docker/podman: tag crimson flavor container as 'sha-1-flavor'

see also: ceph/ceph-container#1704

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit b0a14d6e1eb194fe654fe160430d953a96a7e355)

cephadm: Make list_networks ipv6 enabled

Currently the list_network command and methods in cephadm only run and
parse ipv4 output from `ip route`.

This patch extends the list_network command and internal methods to be
ipv6 enabled. It now also checks `ip -6 route` and `ip -6 addr` to
gather gather all networks from both protocol families.

Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit c64d273084bcd3d43c6b63dc070de3f244f86ca8)

Merge pull request #36034 from smithfarm/wip-46261-octopus

octopus: common, osd: add sanity checks around osd_scrub_max_preemptions

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

Merge pull request #36033 from smithfarm/wip-46089-octopus

octopus: osd/PG: fix history.same_interval_since of merge target again

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

Merge pull request #36032 from smithfarm/wip-46086-octopus

octopus: osd: wakeup all threads of shard rather than one thread.

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