]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Daniel-Pivonka [Tue, 24 Mar 2020 19:31:21 +0000 (15:31 -0400)]
cephadm: rm-cluster clean up /etc/ceph
rm-cluster command will delete config, keyring, and pub key files from /etc/ceph
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
(cherry picked from commit
b3f69b10dfa269b29fe417c47189d1dc7608a407 )
Sage Weil [Mon, 30 Mar 2020 13:34:39 +0000 (08:34 -0500)]
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>
Sage Weil [Mon, 30 Mar 2020 13:33:32 +0000 (08:33 -0500)]
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>
Lenz Grimmer [Mon, 30 Mar 2020 10:54:16 +0000 (12:54 +0200)]
Merge pull request #34212 from s0nea/wip-44709-octopus
octopus: mgr/dashboard: correct Orchestrator documentation link
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sage Weil [Sun, 29 Mar 2020 22:38:01 +0000 (17:38 -0500)]
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>
Sage Weil [Sun, 29 Mar 2020 22:37:46 +0000 (17:37 -0500)]
Merge PR #34258 into octopus
* refs/pull/34258/head:
cephadm: Fix trucated output of `mgr dump`
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Sun, 29 Mar 2020 22:37:30 +0000 (17:37 -0500)]
Merge PR #34199 into octopus
* refs/pull/34199/head:
mgr/rook: Blinking lights
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Sat, 28 Mar 2020 00:59:14 +0000 (19:59 -0500)]
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>
Sage Weil [Sat, 28 Mar 2020 00:57:45 +0000 (19:57 -0500)]
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>
Sage Weil [Sat, 28 Mar 2020 00:57:13 +0000 (19:57 -0500)]
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>
Sebastian Wagner [Fri, 27 Mar 2020 22:24:58 +0000 (23:24 +0100)]
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 )
Nathan Cutler [Tue, 22 Oct 2019 14:45:04 +0000 (16:45 +0200)]
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 )
Nathan Cutler [Tue, 22 Oct 2019 14:35:27 +0000 (16:35 +0200)]
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 )
Nathan Cutler [Tue, 22 Oct 2019 14:31:14 +0000 (16:31 +0200)]
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 )
Nathan Cutler [Tue, 22 Oct 2019 13:59:12 +0000 (15:59 +0200)]
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 )
Nathan Cutler [Tue, 22 Oct 2019 13:42:48 +0000 (15:42 +0200)]
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 )
Josh Durgin [Fri, 27 Mar 2020 19:39:25 +0000 (12:39 -0700)]
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>
Nathan Cutler [Fri, 27 Mar 2020 10:06:32 +0000 (11:06 +0100)]
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>
Nathan Cutler [Fri, 27 Mar 2020 09:32:30 +0000 (10:32 +0100)]
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>
Nathan Cutler [Thu, 26 Mar 2020 13:09:59 +0000 (14:09 +0100)]
doc: fix cephadm link
Fixes: 8fe460e7562b28e007179eeb533ef68a3e99b4c8
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
7dd012252ce3be13d8d44a5c3829198fc72b5754 )
Thomas Bechtold [Fri, 27 Mar 2020 07:16:28 +0000 (08:16 +0100)]
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 )
Neha [Wed, 25 Mar 2020 17:29:48 +0000 (17:29 +0000)]
doc/releases/octopus.rst: fix min_mon_release string
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
c1c6f8f8c191d206659116bbc04695999478b450 )
Sage Weil [Thu, 26 Mar 2020 15:04:16 +0000 (10:04 -0500)]
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>
Sage Weil [Thu, 26 Mar 2020 14:59:31 +0000 (09:59 -0500)]
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>
Sage Weil [Thu, 26 Mar 2020 14:59:19 +0000 (09:59 -0500)]
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>
Sage Weil [Thu, 26 Mar 2020 14:59:07 +0000 (09:59 -0500)]
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>
Sage Weil [Thu, 26 Mar 2020 14:58:55 +0000 (09:58 -0500)]
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>
Sage Weil [Thu, 26 Mar 2020 14:58:42 +0000 (09:58 -0500)]
Merge PR #34190 into octopus
* refs/pull/34190/head:
mgr/cephadm: fix 'orch ps --refresh'
Reviewed-by: Michael Fritch <mfritch@suse.com>
Sage Weil [Thu, 26 Mar 2020 14:58:29 +0000 (09:58 -0500)]
Merge PR #34191 into octopus
* refs/pull/34191/head:
mgr/cephadm: bind grafana to all interfaces
Reviewed-by: Michael Fritch <mfritch@suse.com>
Tatjana Dehler [Mon, 23 Mar 2020 10:45:53 +0000 (11:45 +0100)]
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 )
Nathan Cutler [Wed, 25 Mar 2020 22:41:28 +0000 (23:41 +0100)]
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 )
Abhishek L [Thu, 26 Mar 2020 12:10:46 +0000 (13:10 +0100)]
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>
Sage Weil [Wed, 25 Mar 2020 22:13:46 +0000 (17:13 -0500)]
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 )
Juan Miguel Olmo Martínez [Mon, 17 Feb 2020 09:59:46 +0000 (10:59 +0100)]
mgr/rook: Blinking lights
Blinking lights implementation
Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit
a35c1b25933ba5583e9c6b8752d2949462f92025 )
Sage Weil [Thu, 26 Mar 2020 02:02:06 +0000 (21:02 -0500)]
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>
Sage Weil [Thu, 26 Mar 2020 02:01:20 +0000 (21:01 -0500)]
ceph_release: stable, not rc
This should have happened before v15.2.0.. oops!
Signed-off-by: Sage Weil <sage@redhat.com>
Michael Fritch [Mon, 23 Mar 2020 23:41:09 +0000 (17:41 -0600)]
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 )
Michael Fritch [Wed, 18 Mar 2020 19:57:18 +0000 (13:57 -0600)]
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 )
Michael Fritch [Tue, 17 Mar 2020 21:14:55 +0000 (15:14 -0600)]
mgr/cephadm: combine `get_daemon_name` and `get_rados_user` funcs
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
fdf90bf530edbb9608fb8a5d273f7ce38147f534 )
Michael Fritch [Tue, 17 Mar 2020 17:17:17 +0000 (11:17 -0600)]
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 )
Michael Fritch [Tue, 17 Mar 2020 04:48:31 +0000 (22:48 -0600)]
mgr/cephadm: add deployment example to NFS docs
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
77440d91c1be7c872fc91042a0d723b9198f224f )
Michael Fritch [Tue, 17 Mar 2020 04:47:36 +0000 (22:47 -0600)]
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 )
Michael Fritch [Mon, 16 Mar 2020 18:05:56 +0000 (12:05 -0600)]
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 )
Michael Fritch [Sun, 15 Mar 2020 18:14:05 +0000 (12:14 -0600)]
mgr/cephadm: pass NFSServiceSpec instead of pool/namespace args
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
8bb79a5f275ecf79428dc35a8fc1a76c36569df3 )
Michael Fritch [Sun, 15 Mar 2020 17:08:23 +0000 (11:08 -0600)]
mgr/cephadm: add nfs apply test
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
78ce6d431806c1f3e8e55e946eff64d450821db1 )
Michael Fritch [Sun, 15 Mar 2020 16:53:32 +0000 (10:53 -0600)]
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 )
Michael Fritch [Fri, 13 Mar 2020 20:19:23 +0000 (14:19 -0600)]
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 )
Michael Fritch [Mon, 9 Mar 2020 23:21:11 +0000 (17:21 -0600)]
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 )
Michael Fritch [Mon, 9 Mar 2020 18:44:06 +0000 (12:44 -0600)]
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 )
Michael Fritch [Mon, 9 Mar 2020 18:38:25 +0000 (12:38 -0600)]
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 )
Michael Fritch [Sun, 8 Mar 2020 23:27:54 +0000 (17:27 -0600)]
mgr/cephadm: update docs
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
530c62d76d79c4dd90a966302cd07d1017261686 )
Michael Fritch [Sun, 8 Mar 2020 16:53:17 +0000 (10:53 -0600)]
mgr/cephadm: add minimal caps for nfs client keyring
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
94600c69e2f547c02017204c909d11d626649066 )
Michael Fritch [Thu, 27 Feb 2020 14:48:58 +0000 (07:48 -0700)]
mgr/cephadm: add logging to NFSGanesha class
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
26ea33ad4b0e624345d34526dcf04e35176d2c8e )
Michael Fritch [Thu, 27 Feb 2020 14:24:52 +0000 (07:24 -0700)]
mgr/cephadm: create empty nfs rados config obj
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
9103f4758beb7e0f0dba523f776f9918c0dbfe6d )
Michael Fritch [Wed, 26 Feb 2020 19:34:42 +0000 (12:34 -0700)]
mgr/cephadm: add nfs tests
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
b2b6e016d190d4a5dacfc1a4f27adf5d2d7a7aa0 )
Michael Fritch [Tue, 25 Feb 2020 02:32:49 +0000 (19:32 -0700)]
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 )
Michael Fritch [Mon, 24 Feb 2020 18:47:34 +0000 (11:47 -0700)]
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 )
Michael Fritch [Mon, 24 Feb 2020 18:43:07 +0000 (11:43 -0700)]
mgr/cephadm: split out `config-and-keyrings` json
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
3be608102834bbc7ba5de927ccc868b5b5fb3cad )
Michael Fritch [Mon, 24 Feb 2020 14:50:05 +0000 (07:50 -0700)]
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 )
Sage Weil [Wed, 25 Mar 2020 15:34:21 +0000 (10:34 -0500)]
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 )
Sage Weil [Wed, 25 Mar 2020 15:39:59 +0000 (10:39 -0500)]
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 )
Sage Weil [Thu, 26 Mar 2020 01:26:52 +0000 (20:26 -0500)]
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>
Sage Weil [Thu, 26 Mar 2020 01:26:39 +0000 (20:26 -0500)]
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>
Sage Weil [Thu, 26 Mar 2020 01:26:27 +0000 (20:26 -0500)]
Merge PR #34157 into octopus
* refs/pull/34157/head:
Add alertmanager adopt
Reviewed-by: Michael Fritch <mfritch@suse.com>
Sage Weil [Thu, 26 Mar 2020 01:26:11 +0000 (20:26 -0500)]
Merge PR #34158 into octopus
* refs/pull/34158/head:
Add alertmanager sample
Reviewed-by: Michael Fritch <mfritch@suse.com>
Sage Weil [Thu, 26 Mar 2020 01:25:58 +0000 (20:25 -0500)]
Merge PR #34160 into octopus
* refs/pull/34160/head:
mgr/orch: allow list daemons by service_name
Reviewed-by: Michael Fritch <mfritch@suse.com>
Sage Weil [Thu, 26 Mar 2020 01:20:26 +0000 (20:20 -0500)]
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>
Sage Weil [Thu, 26 Mar 2020 01:19:46 +0000 (20:19 -0500)]
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>
Sage Weil [Tue, 24 Mar 2020 16:46:30 +0000 (11:46 -0500)]
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 )
Sage Weil [Tue, 24 Mar 2020 16:07:12 +0000 (11:07 -0500)]
mgr/cephadm: fix 'upgrade start' message when specifying a version
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
c6b0c28d748f7eec1455d00be15ab7f0b985ecf5 )
Joshua Schmid [Wed, 25 Mar 2020 09:53:06 +0000 (10:53 +0100)]
mgr/cephadm: DriveGroupSpec needs to know about unmanaged attribute
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit
f7bb0236aa601e5439875a97c2250be20956a4e7 )
Joshua Schmid [Wed, 25 Mar 2020 08:34:06 +0000 (09:34 +0100)]
mgr/cephadm: DriveGroupSpec needs to support/ignore _unmanaged_
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit
bda6a47aac0d5db6a5b07c50e7ac45c4682a9d0d )
Kefu Chai [Sat, 21 Mar 2020 06:07:40 +0000 (14:07 +0800)]
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 )
Michael Fritch [Wed, 11 Mar 2020 00:38:29 +0000 (18:38 -0600)]
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 )
Nathan Cutler [Mon, 23 Mar 2020 14:41:16 +0000 (15:41 +0100)]
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 )
Abhishek Lekshmanan [Tue, 24 Mar 2020 10:49:56 +0000 (11:49 +0100)]
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 )
Jacek Suchenia [Sat, 14 Mar 2020 13:12:10 +0000 (14:12 +0100)]
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 )
Kiefer Chang [Tue, 10 Mar 2020 11:43:42 +0000 (19:43 +0800)]
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 )
Eric Jackson [Fri, 13 Mar 2020 18:42:57 +0000 (14:42 -0400)]
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 )
Eric Jackson [Fri, 13 Mar 2020 18:35:54 +0000 (14:35 -0400)]
Add alertmanager adopt
Signed-off-by: Eric Jackson <swiftgist@gmail.com>
(cherry picked from commit
354d9d2d58b3991c73eb0fb9b58fcfaf9436afba )
Jan Fajerski [Tue, 24 Mar 2020 13:53:26 +0000 (14:53 +0100)]
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 )
Michael Fritch [Wed, 11 Mar 2020 00:40:07 +0000 (18:40 -0600)]
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 )
Michael Fritch [Thu, 19 Mar 2020 19:43:56 +0000 (13:43 -0600)]
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 )
Sage Weil [Fri, 20 Mar 2020 16:36:10 +0000 (11:36 -0500)]
debian: add ceph-grafana-dashboards package
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
01015f8ca320e2eab089741e5a8871a4d78c2fc2 )
Sage Weil [Fri, 20 Mar 2020 15:15:54 +0000 (10:15 -0500)]
ceph.spec: put prometheus alerts in vendor-neutral location
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
f1b516d1bf44f2236c22d5a36f0363f4768e4a6b )
Sage Weil [Fri, 20 Mar 2020 14:27:28 +0000 (09:27 -0500)]
mgr/cephadm: include prom alerts, if present in the container
The prometheus config already looks in/etc/prometheus/alerting/*, so drop
this file into position.
Note that the file is currently only present in SUSE builds, so that needs
to be fixed still.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
b1463998bddb67973b59930cc73901143d0961f8 )
Sage Weil [Fri, 20 Mar 2020 16:12:06 +0000 (11:12 -0500)]
mgr/cephadm: point alertmanager at all mgr/dashboard URLs
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
41d0966b72b52a78aa63cb8776b07d23668526d9 )
Sebastian Wagner [Mon, 23 Mar 2020 13:27:51 +0000 (14:27 +0100)]
mgr/cephadm: Add example to run when debugging ssh failures
```
$ ceph orch host add foobar
Error ENOENT: Failed to connect to foobar (foobar). Check that the host is reachable and accepts connections using the cephadm SSH key
you may want to run:
> ssh -F =(ceph cephadm get-ssh-config) -i =(ceph config-key get mgr/cephadm/ssh_identity_key) rook@foobar
$ ssh -F =(ceph cephadm get-ssh-config) -i =(ceph config-key get mgr/cephadm/ssh_identity_key) rook@foobar
ssh: Could not resolve hostname foobar: Temporary failure in name resolution
```
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
c840dd2204e9a419c28875ace18d33ad6f87500f )
Nathan Cutler [Tue, 24 Mar 2020 16:16:45 +0000 (17:16 +0100)]
Merge pull request #34125 from smithfarm/wip-cbs-deprecate-octopus
octopus: ceph-backport.sh: add deprecation warning
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
Nathan Cutler [Tue, 24 Mar 2020 15:46:10 +0000 (16:46 +0100)]
Merge pull request #34137 from theanalyst/octopus-changelog-1
octopus: doc: add changelog for octopus release
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Abhishek Lekshmanan [Tue, 24 Mar 2020 09:29:23 +0000 (10:29 +0100)]
doc: add changelog for octopus release
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
dc7cf3fe8986de7b3e245ea04084eef51c7a0cdf )
Sage Weil [Tue, 24 Mar 2020 01:01:12 +0000 (20:01 -0500)]
Merge PR #34100 into octopus
* refs/pull/34100/head:
doc/cephadm: notes on status/stability
doc/cephadm: some troubleshooting tips
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sage Weil [Tue, 24 Mar 2020 01:00:58 +0000 (20:00 -0500)]
Merge PR #34115 into octopus
* refs/pull/34115/head:
doc/releases/octopus: drop stray line
doc/releases/octopus: note about repository locations
doc/releases: include octopus in index
doc/install/get-packages: update package install instructions
doc/releases/octopus: final notes
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Alfonso Martínez [Tue, 10 Mar 2020 14:06:35 +0000 (15:06 +0100)]
vstart_runner.py: fix OSError when checking if non-existent path is mounted
Fixes: https://tracker.ceph.com/issues/44545
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit
3b9f99c549422a005676e99777cecc450177f157 )
Sage Weil [Mon, 23 Mar 2020 18:54:12 +0000 (13:54 -0500)]
doc/releases/octopus: drop stray line
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 23 Mar 2020 14:11:10 +0000 (09:11 -0500)]
doc/releases/octopus: note about repository locations
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 23 Mar 2020 13:50:14 +0000 (08:50 -0500)]
doc/releases: include octopus in index
Signed-off-by: Sage Weil <sage@redhat.com>
Jenkins Build Slave User [Mon, 23 Mar 2020 17:47:45 +0000 (17:47 +0000)]
15.2.0
Sage Weil [Mon, 23 Mar 2020 13:49:09 +0000 (08:49 -0500)]
doc/install/get-packages: update package install instructions
- include cephadm method
- update to include new version URLs
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 23 Mar 2020 17:38:24 +0000 (12:38 -0500)]
Merge PR #34119 into octopus
* refs/pull/34119/head:
doc: update octopus release notes for rgw
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>