cephadm: ceph-volume: disallow concurrent execution

Fixes: https://tracker.ceph.com/issues/44820
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit eae20a70738f20738b3754e464b8a4922912e58a)

Merge pull request #34355 from smithfarm/wip-44710-octopus

octopus: doc/cephadm: replace `osd create` with `apply osd`

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

doc/cephadm: replace `osd create` with `apply osd`

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

Merge PR #34225 into octopus

* refs/pull/34225/head:
doc/start: Update hardware recommendations.

Reviewed-by: David Galloway <dgallowa@redhat.com>

Merge PR #34280 into octopus

* refs/pull/34280/head:
mgr/dashboard: do not fail on user creation

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

Merge PR #34313 into octopus

* refs/pull/34313/head:
qa/*/osd-backfill-recovery-log.sh: flush_pg_stats before checking log length

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

Merge PR #34339 into octopus

* refs/pull/34339/head:
qa/tasks/mgr/dashboard/test_rbd: wait longer when purging

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>

qa/tasks/mgr/dashboard/test_rbd: wait longer when purging

Fixes: https://tracker.ceph.com/issues/44743
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
Co-authored-by: Kefu Chai <kefu@redhat.com>
Co-authored-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 1c3d6539d93961f9f7bd5308771725410bde32ec)

Merge pull request #34323 from dillaman/wip-44861-octopus

octopus: librbd: fix client backwards compatibility issues

librbd: re-add support for nautilus clients talking to jewel clusters

We want to support N - 3 client backward compatibility (special case
to support Jewel since it was a LTS release). The "get_snapshot_timestamp"
cls method does not exist in Jewel clusters so librbd should fallback
to excluding the op if it fails.

Note that this N - 3 also needs to apply for downstream releases as well,
which implies we still need Jewel for the time being.

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

Conflicts:
src/test/librbd/image/test_mock_RefreshRequest.cc: tweaked to support pool configs
(cherry picked from commit d1a67c3bda09430bb21f768fb743b3e41c7d411e)

librbd: ignore -EOPNOTSUPP errors when retrieving image group membership

The Luminous release did not support adding images to a group (it only
included the bare-minimum support for creating groups). Commit f76df32666b
incorrectly dropped support for ignoring this possible failure. This
prevents Nautilus-release clients from opening images contained within
a Luminous-release cluster.

Fixes: http://tracker.ceph.com/issues/38834
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 6f29dc69a0db3b6d982c95ab9d3b9b00a7029e37)
(cherry picked from commit ab720d4c0026d596dcea8782fbdd1640c93ec384)

Merge pull request #34202 from tspmelo/wip-44741-octopus

octopus: mgr/dashboard: Check for missing npm resolutions

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

qa/*/osd-backfill-recovery-log.sh: flush_pg_stats before checking log length

It is possible for the pg dump to not be the latest when we check for newprimary
in _common_test(). This is because mgr_stats_period is 5 seconds, and we may not
have fetched the latest stats just yet. This causes the test to look at the same
stats before and after wait_for_clean.

Fixes: https://tracker.ceph.com/issues/43807 (2)
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit cfebec1b128bc2191d2bbe90f99191ae7750b203)

Merge PR #34132 into octopus

* refs/pull/34132/head:
vstart_runner.py: fix OSError when checking if non-existent path is mounted

Reviewed-by: Sage Weil <sage@redhat.com>

Merge PR #34255 into octopus

* refs/pull/34255/head:
qa/tasks/ceph.py: fail test if osd devices not found
qa/tasks/ceph.py: use .format to log dicts
qa/tasks/ceph.py: drop roles_to_journals and remote_to_roles_to_journals
qa/tasks/ceph.py: drop block_journal, tmpfs_journal
qa/tasks/ceph.py: cleanup: stop calling get_wwn_id_map()

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

Merge pull request #34212 from s0nea/wip-44709-octopus

octopus: mgr/dashboard: correct Orchestrator documentation link

Reviewed-by: Sebastian Wagner <swagner@suse.com>

mgr/dashboard: do not fail on user creation

Accordingly to other Ceph commands do not fail on user
creation with a non-zero error code if the user already
exists.
Instead succeed and return the message 'User <username>
already exists'.

Fixes: https://tracker.ceph.com/issues/44502
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit 9992faa9479b62f05f36352daf89f6e7541f29c9)

Merge PR #34192 into octopus

* refs/pull/34192/head:
mgr/cephadm: add watch_url to NFS bootstrap config
mgr/cephadm: check for an existing NFS config object
mgr/cephadm: combine `get_daemon_name` and `get_rados_user` funcs
mon: allow `auth caps` for `mgr` profile
mgr/cephadm: add deployment example to NFS docs
mgr/cephadm: add utils.py
mgr/cephadm: create/update keyring during nfs config
mgr/cephadm: pass NFSServiceSpec instead of pool/namespace args
mgr/cephadm: add nfs apply test
mgr/cephadm: fix nfs redeploy/reconfig
mgr/cephadm: ensure nfs uses the correct entity
mgr/cephadm: fix service name for nfs type
mgr/cephadm: apply nfs service spec
mgr/cephadm: don't create a unique nfs daemon name
mgr/cephadm: update docs
mgr/cephadm: add minimal caps for nfs client keyring
mgr/cephadm: add logging to NFSGanesha class
mgr/cephadm: create empty nfs rados config obj
mgr/cephadm: add nfs tests
mgr/cephadm: add a minimal ganesha.conf
mgr/cephadm: deploy nfs-ganesha service
mgr/cephadm: split out `config-and-keyrings` json
mgr/orchestrator: rearrange interface to match impl. order

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge PR #34258 into octopus

* refs/pull/34258/head:
cephadm: Fix trucated output of `mgr dump`

Reviewed-by: Sage Weil <sage@redhat.com>

Merge PR #34199 into octopus

* refs/pull/34199/head:
mgr/rook: Blinking lights

Reviewed-by: Sage Weil <sage@redhat.com>

Merge PR #34204 into octopus

* refs/pull/34204/head:
osd/PeeringState: drop mimic assert

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

Merge PR #34178 into octopus

* refs/pull/34178/head:
pybind/mgr/*: fix config_notify handling of default values

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

Merge PR #34123 into octopus

* refs/pull/34123/head:
osd/PeeringState: fix pending want_acting vs osd offline race

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

cephadm: Fix trucated output of `mgr dump`

In case the process has terminated, we
have to make sure to read till EOF, otherwise
we might skip some bytes.

Fixes: https://tracker.ceph.com/issues/44642
Co-authored-by: Tim Serong <tserong@suse.com>
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 6a6759eef06c32efe1a10190925da6bc7e5ec4b0)

qa/tasks/ceph.py: fail test if osd devices not found

Fixes: https://tracker.ceph.com/issues/42357
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit bc76b39a30ba1301132b14dd65f0f9ee935c508b)

qa/tasks/ceph.py: use .format to log dicts

The ".format" builtin logs dicts nicely right out of the box.

Also, some of the log messages were too cryptic - fixed them in this commit as
well.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 9abebf28a8c519053bf2e89a944a0b1fdc167ddd)

qa/tasks/ceph.py: drop roles_to_journals and remote_to_roles_to_journals

These do not seem to get any use anymore.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit ad477be286e373aa00cbf0ab02f9bc9b1321663e)

qa/tasks/ceph.py: drop block_journal, tmpfs_journal

I looked, but did not find any tests that actually use these options.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 13933171297da0e35461e0c7420751867a645b5b)

qa/tasks/ceph.py: cleanup: stop calling get_wwn_id_map()

Nowadays, get_wwn_id_map is essentially a noop - it does:

    return dict((d, d) for d in devs)

This reverts another bit of 8f720454cbb536ac6f410fb6c18b2b0945b70160 from 2013.

References: https://tracker.ceph.com/issues/42313
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 51c714d9b29402f21b25b5754d42f917964079e2)

Merge pull request #34214 from neha-ojha/wip-34183-octopus

octopus: doc/releases/octopus.rst: fix min_mon_release string

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

Merge pull request #34207 from liewegas/bp-34188-octopus

octopus: doc: do not encourage readers to run multiple clusters on same HW

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

Merge pull request #34237 from smithfarm/wip-sle-15.2-octopus

octopus: qa/distros: add SLE-15-SP2

Reviewed-by: Thomas Bechtold <tbechtold@suse.com>

doc: fix cephadm link

Fixes: 8fe460e7562b28e007179eeb533ef68a3e99b4c8
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 7dd012252ce3be13d8d44a5c3829198fc72b5754)

qa/distros: add SLE-15-SP2

Ceph octopus is known to run on SLE-15-SP2 so add it to
qa/distros/all.

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
(cherry picked from commit 3261e24636474a3e274c65b859e9325299470f11)

doc/start: Update hardware recommendations.

Signed-off-by: Mark Nelson <mnelson@redhat.com>
(cherry picked from commit 3305a0732403ba7fe58fe6248868b7711bbccc72)

doc/releases/octopus.rst: fix min_mon_release string

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit c1c6f8f8c191d206659116bbc04695999478b450)

Merge PR #34194 into octopus

* refs/pull/34194/head:
CMakeLists: 15.2.0
ceph_release: stable, not rc

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

Merge PR #33939 into octopus

* refs/pull/33939/head:
mgr/dashboard: NoRebalance flag is added to the Dashboard

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>

Merge PR #34163 into octopus

* refs/pull/34163/head:
mgr: ceph_pg_* metrics contains last value instead of sum all of them

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

Merge PR #34185 into octopus

* refs/pull/34185/head:
mgr/cephadm: DriveGroupSpec needs to know about unmanaged attribute
mgr/cephadm: DriveGroupSpec needs to support/ignore _unmanaged_

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Joshua Schmid <jschmid@suse.de>

Merge PR #34186 into octopus

* refs/pull/34186/head:
mgr/cephadm: use docker.io in default container image name
mgr/cephadm: fix 'upgrade start' message when specifying a version

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge PR #34190 into octopus

* refs/pull/34190/head:
mgr/cephadm: fix 'orch ps --refresh'

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge PR #34191 into octopus

* refs/pull/34191/head:
mgr/cephadm: bind grafana to all interfaces

Reviewed-by: Michael Fritch <mfritch@suse.com>

mgr/dashboard: correct Orchestrator documentation link

Fixes: https://tracker.ceph.com/issues/44708
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit 6e91edb287188f64694f82ba55d35fc2d589bbe6)

doc: do not encourage readers to run multiple clusters on same HW

This material was first added on December 22, 2012 by
46d0334456c14da2bc8e012f121c545b1b33b95f

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 8fe460e7562b28e007179eeb533ef68a3e99b4c8)

Merge pull request #34176 from theanalyst/backports/oct-distro-fix

octopus: doc: releases: add a note on debian packages & those built by the community

Reviewed-By: Sage Weil <sweil@redhat.com>

osd/PeeringState: drop mimic assert

This code can still execute for a cluster that has require_osd_release >=
nautilus because a PG is processing an older OSDMap.  Drop this assert
since the osd boot checks on require_osd_release are sufficient.

Fixes: https://tracker.ceph.com/issues/44759
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 29b7469fb7196f0ce7b2ae5d0a21226ab15ba306)

mgr/dashboard: Update Angular and fix npm audits

This fixes a new audit problem found in older versions of "acorn"
and updates Angular to latest v8 version.

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

mgr/dashboard: Update prettier

Fix all new linting errors.

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

mgr/dashboard: Check for missing npm resolutions

Check if it's necessary to run "npm run fix:audit" before committing the changes.

This is important to resolve some issues with building and
to fix some npm vulnerabilities.

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

mgr/rook: Blinking lights

Blinking lights implementation

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

CMakeLists: 15.2.0

I'm not actually sure if this is used for much of anything...

Signed-off-by: Sage Weil <sage@redhat.com>

ceph_release: stable, not rc

This should have happened before v15.2.0.. oops!

Signed-off-by: Sage Weil <sage@redhat.com>

mgr/cephadm: add watch_url to NFS bootstrap config

watch for changes to the per-daemon RADOS conf file

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

mgr/cephadm: check for an existing NFS config object

assume an existing NFS config if the named rados object already exists

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

mgr/cephadm: combine `get_daemon_name` and `get_rados_user` funcs

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

mon: allow `auth caps` for `mgr` profile

cephadm orchestrator needs to update the caps during reconfig/redeploy

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

mgr/cephadm: add deployment example to NFS docs

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

mgr/cephadm: add utils.py

move `name_to_config_section` and `assert_valid_host` into utils.py

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

mgr/cephadm: create/update keyring during nfs config

the keyring might already exist from a prior config/reconfig/redeploy.

attempt to get_or_create the keyring first and than update the keyring
caps afterward

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

mgr/cephadm: pass NFSServiceSpec instead of pool/namespace args

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

mgr/cephadm: add nfs apply test

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

mgr/cephadm: fix nfs redeploy/reconfig

search for the `NFSServiceSpec` instead of passing empty
`cephadm_args` during `_create_daemon`

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

mgr/cephadm: ensure nfs uses the correct entity

mon entity needs to start with `client.`

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

mgr/cephadm: fix service name for nfs type

the `nfs` service was incorrectly reported as `mds`

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

mgr/cephadm: apply nfs service spec

orch apply nfs <svc_id> [<placement>]

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

mgr/cephadm: don't create a unique nfs daemon name

only one nfs daemon will be deployed per host

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

mgr/cephadm: update docs

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

mgr/cephadm: add minimal caps for nfs client keyring

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

mgr/cephadm: add logging to NFSGanesha class

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

mgr/cephadm: create empty nfs rados config obj

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

mgr/cephadm: add nfs tests

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

mgr/cephadm: add a minimal ganesha.conf

we only need to specify the rados pool and config object url

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

mgr/cephadm: deploy nfs-ganesha service

orch daemon add nfs <svc_arg> <pool> [<namespace>] [<placement>]

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

mgr/cephadm: split out `config-and-keyrings` json

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

mgr/orchestrator: rearrange interface to match impl. order

rgw impl. happens before rbd impl

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

mgr/cephadm: bind grafana to all interfaces

Fixes: https://tracker.ceph.com/issues/44608
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 5f4fedbd5beeccc4792241bcfd2b81bdeb4c7d57)

mgr/cephadm: fix 'orch ps --refresh'

The use of host in the refresh loop was clobbering the argument value.

Fixes: https://tracker.ceph.com/issues/44513
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 764ce71bd202315fdf4403d9e1e8ae55ef849a90)

Merge PR #34154 into octopus

* refs/pull/34154/head:
mgr/cephadm: point alertmanager at all mgr/dashboard URLs

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge PR #34155 into octopus

* refs/pull/34155/head:
debian: add ceph-grafana-dashboards package
ceph.spec: put prometheus alerts in vendor-neutral location
mgr/cephadm: include prom alerts, if present in the container

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge PR #34157 into octopus

* refs/pull/34157/head:
Add alertmanager adopt

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge PR #34158 into octopus

* refs/pull/34158/head:
Add alertmanager sample

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge PR #34160 into octopus

* refs/pull/34160/head:
mgr/orch: allow list daemons by service_name

Reviewed-by: Michael Fritch <mfritch@suse.com>

Merge PR #34153 into octopus

* refs/pull/34153/head:
mgr/cephadm: Add example to run when debugging ssh failures

Reviewed-by: Sebastian Wagner <swagner@suse.com>

Merge PR #34156 into octopus

* refs/pull/34156/head:
cephadm: init config and keyring with None
cephadm: allow config and keyring args for ceph-volume
qa/workunits/cephadm: create lvs before calling cephadm
qa/workunits/cephadm/test_cephadm.sh: move osd test to ceph-volume
qa/workunits/cephadm/test_cephadm.sh: fix mon.b failure

Reviewed-by: Michael Fritch <mfritch@suse.com>

mgr/cephadm: use docker.io in default container image name

Not all hosts have docker.io configured as a default registry.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit d4f367a7ea96c97c7aa437f79a1c2dabb2c7caf8)

mgr/cephadm: fix 'upgrade start' message when specifying a version

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit c6b0c28d748f7eec1455d00be15ab7f0b985ecf5)

mgr/cephadm: DriveGroupSpec needs to know about unmanaged attribute

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

mgr/cephadm: DriveGroupSpec needs to support/ignore _unmanaged_

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

cephadm: init config and keyring with None

and we should not assume that both `config` and `keying` are specified
when calling this method. because, for instance, `create_daemon_dirs()`
does handle the case where `config` and/or `keyring` is not specified.

this is a follow-up fix of 245d6a5cec9cc0f299613b8cc0415e494a4c3ac5

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 86de901d89b26920c1493e3867ddfafa9f9c95cd)

cephadm: allow config and keyring args for ceph-volume

easier to script via the cephadm tests

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

pybind/mgr/*: fix config_notify handling of default values

After 5ace82e65c72847fb875fc01c419937a26a59d70 was merged, I found
three more instances of the code being patched.

The commit message of 5ace82e65c72847fb875fc01c419937a26a59d70 was/is:

"The default values are handled by mgr_module.py's _get_module_option();
the or here means that we break any non-true (0, false, none) value and
override it with the default."

Fixes: 5ace82e65c72847fb875fc01c419937a26a59d70
Fixes: https://tracker.ceph.com/issues/43746
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 30585f44de6147c824ed2df1a477ad17f7b51fff)

doc: releases: add a note on debian packages & those built by the community

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 2cdca1ff6def0da2b6e6c67b276eaf964b02a010)

mgr: ceph_pg_* metrics contains last value instead of sum all of them

During evaluation of pool stats metrics contains last reported value instead of sum

Fixes: https://tracker.ceph.com/issues/44590
Signed-off-by: Jacek Suchenia <jacek.suchenia@gmail.com>
(cherry picked from commit ad4d790a35af483f3a240f247cda5754301a9199)

mgr/orch: allow list daemons by service_name

Services like rgw and mds are differentiated by service_name. For
example: mds.xyz vs. mds.abc. With current interface, we can't list all
daemons belonged to mds.xyz only. Add service_name as a new argument to
filter daemons by it.

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

Add alertmanager sample

Default contents of alertmanager.yml with additional peers key

Signed-off-by: Eric Jackson <swiftgist@gmail.com>
(cherry picked from commit 5cbe0c4f8fc9b7ca24a140643237e13df6851463)

Add alertmanager adopt

Signed-off-by: Eric Jackson <swiftgist@gmail.com>
(cherry picked from commit 354d9d2d58b3991c73eb0fb9b58fcfaf9436afba)

qa/workunits/cephadm: create lvs before calling cephadm

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

qa/workunits/cephadm/test_cephadm.sh: move osd test to ceph-volume

instead of via the orchestrator

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

qa/workunits/cephadm/test_cephadm.sh: fix mon.b failure

and is_available check to ensure quorum

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