]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agomgr/cephadm: add timeout when removing iscsi gateway.conf
Adam King [Wed, 5 May 2021 17:40:32 +0000 (13:40 -0400)]
mgr/cephadm: add timeout when removing iscsi gateway.conf

We already catch TimeoutExpired exceptions here but we don't
actually specify a timeout

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit ade46fda791ee2c2e1cac1c2376d56acf7ae4766)

4 years agomgr/cephadm: mock subprocess calls in tests that remove iscsi daemons
Adam King [Wed, 5 May 2021 17:59:54 +0000 (13:59 -0400)]
mgr/cephadm: mock subprocess calls in tests that remove iscsi daemons

tests that remove iscsi daemons use subprocess.run to make
a call to rados to clear out the gateway.conf. We don't want
the tests to actually make that call.

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit c5b984b10c2d6f2eef02e9dbf74aea64bf11f19a)

4 years agoqa/tasks/cephadm_cases: longer wait for osd to start
Sage Weil [Wed, 5 May 2021 16:03:02 +0000 (11:03 -0500)]
qa/tasks/cephadm_cases: longer wait for osd to start

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit a103fd6955bb89f857f56a4ec73d77c3a8818d78)

4 years agomgr/cephadm: apply hostname/addr checks to 'orch host set-addr' too
Sage Weil [Mon, 3 May 2021 16:09:09 +0000 (12:09 -0400)]
mgr/cephadm: apply hostname/addr checks to 'orch host set-addr' too

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit b5d39be1881775f141dfb3f10ebe4ae3601b75e6)

4 years agomgr/cephadm: make 'host add' idempotent
Sage Weil [Mon, 3 May 2021 16:04:28 +0000 (12:04 -0400)]
mgr/cephadm: make 'host add' idempotent

Do not let prime_empty_host blow away inventory.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit a8acc354dc7dc1245f5030a751f4fc5ddb689b18)

4 years agomgr/cephadm: set host crush location based on HostSpec
Sage Weil [Fri, 30 Apr 2021 15:10:38 +0000 (11:10 -0400)]
mgr/cephadm: set host crush location based on HostSpec

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 2f2c997652539795845184f938a70e67d245705c)

4 years agopython-common: add location property to HostSpec, + tests
Sage Weil [Fri, 30 Apr 2021 15:10:26 +0000 (11:10 -0400)]
python-common: add location property to HostSpec, + tests

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit d2a9a35993e11b726e94d5dec9a5fe098f6e6eba)

4 years agodoc/cephadm: rewriting "starting the upgrade"
Zac Dover [Thu, 6 May 2021 00:03:21 +0000 (10:03 +1000)]
doc/cephadm: rewriting "starting the upgrade"

This PR fixes the prompts in this section and
makes the sentences a tiny bit less onerous for
the reader.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 9dc63ab22aa14f0790f11f672a3f865abfa738cc)

4 years agodoc/cephadm: rewrite "monitoring the upgrade"
Zac Dover [Thu, 6 May 2021 00:30:02 +0000 (10:30 +1000)]
doc/cephadm: rewrite "monitoring the upgrade"

This PR adds correctly-formatted prompts and
makes slight alterations to the readability
of the text.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit f4c16f05b51fa4b2ff0095f331f7d2a4e1e3ca68)

4 years agodoc/cephadm: rewrite "cancelling the upgrade"
Zac Dover [Thu, 6 May 2021 00:34:26 +0000 (10:34 +1000)]
doc/cephadm: rewrite "cancelling the upgrade"

This PR corrects a single prompt in the section
"Cancelling the Upgrade".

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 8d531a754890f054c3533c0a985599b10acf8dc7)

4 years agodoc/cephadm: rewrite "potential problems"
Zac Dover [Thu, 6 May 2021 00:44:23 +0000 (10:44 +1000)]
doc/cephadm: rewrite "potential problems"

This PR adds correct prompts and slightly
reduces the cognitive load of the reader.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 39c05445f211d3033571afa907443d5e7eb88f91)

4 years agodoc/cephadm: rewrite "using customized con..."
Zac Dover [Thu, 6 May 2021 00:54:24 +0000 (10:54 +1000)]
doc/cephadm: rewrite "using customized con..."

This PR rewrites the text in "Using Customized
Container Images" so that it is just a bit
clearer, and it also formats the prompt in the
text correctly.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 630f0c8ad305c074c399c35b9547a9a6a501af3b)

4 years agoAdd Rocky Linux to supported DISTRO_NAMES
Dennis Körner [Tue, 4 May 2021 15:59:59 +0000 (17:59 +0200)]
Add Rocky Linux to supported DISTRO_NAMES

Rocky Linux is a RHEL clone. I did a test-installation of ceph pacific on Rocky Linux RC1 with cephadm. As far as I can see, everything works as expected.

Signed-off-by: Dennis Körner <koerner@netzwerge.de>
(cherry picked from commit 188e6b3fc56960ea731c71e57af64eb8c1fc76ea)

4 years agomgr/cephadm: remove haproxy+keepalived container image from service spec
Sage Weil [Tue, 4 May 2021 16:12:53 +0000 (12:12 -0400)]
mgr/cephadm: remove haproxy+keepalived container image from service spec

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 729ebaabd539f1a09c7cfcdc69dff1e2cb409b0d)

4 years agomgr/cephadm: extend disk selector test which disk size may be decimal
jianglong01 [Mon, 15 Mar 2021 10:09:19 +0000 (18:09 +0800)]
mgr/cephadm:  extend disk selector test which disk size may be decimal

Signed-off-by: jianglong01 <jianglong01@qianxin.com>
(cherry picked from commit 9acd4be8bd56c9d0e848a336be4552b705654a62)

4 years agomgr/cephadm: When device size contains the decimal, it can not match size exactly.
jianglong01 [Fri, 12 Mar 2021 03:03:10 +0000 (11:03 +0800)]
mgr/cephadm: When device size contains the decimal, it can not match size exactly.

for example, osd.yaml:
service_type: osd
service_name: test
placement:
  host_pattern: '*'
spec:
  data_devices:
    size: 3.6TB

Signed-off-by: jianglong01 <jianglong01@qianxin.com>
(cherry picked from commit fd30aff672a1908a37163472f9c6478eca4e98e2)

4 years agomgr/dashboard: fix HAProxy (now called ingress)
Avan Thakkar [Tue, 20 Apr 2021 12:19:23 +0000 (17:49 +0530)]
mgr/dashboard: fix HAProxy (now called ingress)

Fixes: https://tracker.ceph.com/issues/50319
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Support from Dashboard UI to create Ingress service type.

(cherry picked from commit 21318e8fa965c352e00d84c04ee072dd9fe45e4f)

4 years agomgr/cephadm: Purge iscsi configuration from pool and ceph config
Juan Miguel Olmo Martínez [Mon, 22 Mar 2021 15:14:03 +0000 (16:14 +0100)]
mgr/cephadm: Purge iscsi configuration from pool and ceph config

Remove gateway.conf from iscsi pool when service is removed
Remove iscsi ceph config keys
Remove iscsi dashboard gateways config from dashboard

fixes: https://tracker.ceph.com/issues/48930

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

4 years agoMerge remote-tracking branch 'origin/pacific-saved' into pacific
Sage Weil [Fri, 7 May 2021 12:06:31 +0000 (07:06 -0500)]
Merge remote-tracking branch 'origin/pacific-saved' into pacific

4 years agoMerge PR #40557 into pacific
Sage Weil [Fri, 7 May 2021 12:05:36 +0000 (07:05 -0500)]
Merge PR #40557 into pacific

* refs/pull/40557/head:
win32*.sh: disable libcephsqlite when targeting Windows

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years ago16.2.3 v16.2.3
Jenkins Build Slave User [Thu, 6 May 2021 15:47:00 +0000 (15:47 +0000)]
16.2.3

4 years agocephadm: normalize image digest in 'ls' output too
Sage Weil [Wed, 5 May 2021 18:42:36 +0000 (14:42 -0400)]
cephadm: normalize image digest in 'ls' output too

We were previously only normalizing the 'inspect' output.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 06d849acfb77a189abf6e9c26b27aaaefdd77f14)

4 years agoMerge PR #41151 into pacific
Sage Weil [Thu, 6 May 2021 15:00:11 +0000 (10:00 -0500)]
Merge PR #41151 into pacific

* refs/pull/41151/head:
mgr/cephadm: ceph-volume verbose only when fails
qa/workunits/cephadm/test_cephadm: test zap-osds
cephadm: add --zap-osds argument to rm_cluster
cephadm: implement zap-osds --fsid ... command
doc/cephadm: add podman version note to install
mgr/cephadm: check hostname resolution before adding host
cephadm: provide a way to checkhost connection without /etc/hosts passed the shell
doc/cephadm: remove /etc/hosts from list of hostname resoltion methods
qa/suites/rados/cephadm/smoke-roleless: test client-keyring
qa/tasks/cephadm.py: adjust client.admin key mode; place on all hosts
cephadm: distribute client.admin keyring+conf to label:_admin on bootstrap
doc/cephadm: document the default 'admin' label
mgr/cephadm: 'ceph orch client-keyring ...' commands to manage keyring files
mgr/cephadm: reimplement ceph.conf pushing
mgr/cephadm: use _write_remote_file for ceph.conf
mgr/cephadm: _write_remote_file helper
mgr/cephadm: add placementspec for which hosts get ceph.conf
mgr/cephadm: skip ok-to-stop for mons in upgrade if < 3 mons
mgr/cephadm: don't allow upgrade start with less than 2 mgrs
cephadm: re-assimilate user provided conf after mgr created
cephadm: allow several public networks be matched
mgr/cephadm: The command of 'ceph orch daemon restart mgr.xxx' may case mgr daemon loop to restart
doc/cephadm: add a single word
doc/cephadm: adding "device" to a sentence
doc/cephadm: rewrite "nfs.rst"
mgr/cephadm: s/_hosts_with_daemon_inventory/_schedulable_hosts/
mgr/cephadm: don't remove daemons from hosts in maintenance or offline  mode
mgr/cephadm: default status for daemons on maintenance hosts to stopped
qa/tasks/cephadm: fix ctx archive check for teuthology
python-common: use OrderedDict instead of Set to remove duplicates from host labels list
mgr/cephadm: less noise about osd specs
mgr/cephadm: kick serve loop when adding/removing labels
mgr/cephadm: do not place osds on _no_schedule hosts
doc/cephadm: document _no_schedule label
mgr/cephadm: fix 'orch ls' count to reflect schedulable hosts
mgr/cephadm: do not schedule on _no_schedule hosts
doc/cephadm: osd.rst -- removing colons
doc/cephadm: osd: rewrite "additional opts"
doc/cephadm: rewrite "advanced osd s. specs"
doc/cephadm: rewrite "delcarative state" in osd.rst
mgr/MgrStandby: fix config observer
mgr/MgrStandby: respawn if mgr_standby_modules changes
qa/tasks/mgr/test_dashboard: skip test_standby if mgr_standby_modules=false
qa/suites/rados/cephadm/smoke-*: use cephadm.wait_for_service
qa/suites/rados/cephadm/smoke-singlehost: test --single-host-defaults
cephadm: add --single-host-defaults option to bootstrap
mgr/cephadm: allow mgr colo if mgr_standby_modules=false
mgr/MgrStandby: add mgr_standby_modules option
cephadm: ignore apparmor if profiles file is empty

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
4 years agoMerge pull request #41069 from rhcs-dashboard/wip-50498-pacific
Ernesto Puerta [Thu, 6 May 2021 10:02:12 +0000 (12:02 +0200)]
Merge pull request #41069 from rhcs-dashboard/wip-50498-pacific

pacific: mgr/dashboard: set required env. variables in run-backend-api-tests.sh

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #41096 from aaSharma14/wip-50583-pacific
Ernesto Puerta [Thu, 6 May 2021 09:58:49 +0000 (11:58 +0200)]
Merge pull request #41096 from aaSharma14/wip-50583-pacific

pacific: mgr/dashboard: OSDs placement text is unreadable

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #41056 from rhcs-dashboard/wip-50542-pacific
Ernesto Puerta [Thu, 6 May 2021 09:49:43 +0000 (11:49 +0200)]
Merge pull request #41056 from rhcs-dashboard/wip-50542-pacific

pacific: mgr/dashboard: Host Maintenance Follow ups

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
4 years agoMerge pull request #41170 from rhcs-dashboard/wip-50649-pacific
Ernesto Puerta [Thu, 6 May 2021 09:47:18 +0000 (11:47 +0200)]
Merge pull request #41170 from rhcs-dashboard/wip-50649-pacific

pacific: mgr/dashboard: fix set-ssl-certificate{,-key} commands

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
4 years agoMerge pull request #41090 from neha-ojha/wip-49918-pacific
Yuri Weinstein [Wed, 5 May 2021 19:26:22 +0000 (12:26 -0700)]
Merge pull request #41090 from neha-ojha/wip-49918-pacific

pacific: mon/OSDMonitor: drop stale failure_info after a grace period

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41089 from batrick/i50385
Yuri Weinstein [Wed, 5 May 2021 19:25:47 +0000 (12:25 -0700)]
Merge pull request #41089 from batrick/i50385

pacific: pybind/mgr/devicehealth: scrape-health-metrics command accidentally renamed to scrape-daemon-health-metrics

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #40918 from neha-ojha/wip-50402-pacific
Yuri Weinstein [Wed, 5 May 2021 19:25:16 +0000 (12:25 -0700)]
Merge pull request #40918 from neha-ojha/wip-50402-pacific

pacific: common/options/global.yaml.in: increase default value of bluestore_cache_trim_max_skip_pinned

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agomgr/cephadm: ceph-volume verbose only when fails 41151/head
Juan Miguel Olmo Martínez [Tue, 27 Apr 2021 13:54:46 +0000 (15:54 +0200)]
mgr/cephadm: ceph-volume verbose only when fails

Resolves: https://tracker.ceph.com/issues/50526

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

4 years agomgr/dashboard: fix set-ssl-certificate{,-key} commands 41170/head
Alfonso Martínez [Mon, 3 May 2021 16:46:08 +0000 (18:46 +0200)]
mgr/dashboard: fix set-ssl-certificate{,-key} commands

- Now create-self-signed-cert command relies on set-ssl-certificate{,-key} commands.
- Simplify the command testing and increase the test coverage.

Fixes: https://tracker.ceph.com/issues/50519
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit fb20990bca55ffe1712a905c3a9741e8df004e74)

4 years ago16.2.2 v16.2.2
Jenkins Build Slave User [Tue, 4 May 2021 18:38:23 +0000 (18:38 +0000)]
16.2.2

4 years agoqa/workunits/cephadm/test_cephadm: test zap-osds
Sage Weil [Fri, 30 Apr 2021 14:16:16 +0000 (10:16 -0400)]
qa/workunits/cephadm/test_cephadm: test zap-osds

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 4b4f4ad7bf5a6662d5d8555f73de7fb05ad5d47c)

4 years agocephadm: add --zap-osds argument to rm_cluster
Sage Weil [Fri, 30 Apr 2021 14:13:23 +0000 (10:13 -0400)]
cephadm: add --zap-osds argument to rm_cluster

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 14c95b54fb325240635be01dd95517d11f37106b)

4 years agocephadm: implement zap-osds --fsid ... command
Sage Weil [Fri, 30 Apr 2021 13:54:40 +0000 (09:54 -0400)]
cephadm: implement zap-osds --fsid ... command

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit a6a20bafc4a9e780cfd86887418850a6b4ee782c)

4 years agodoc/cephadm: add podman version note to install
Zac Dover [Tue, 30 Mar 2021 15:31:28 +0000 (01:31 +1000)]
doc/cephadm: add podman version note to install

This PR adds a note to the cephadm installation
guide that informs users that only podman version
2.0.0 and higher work with Ceph, with the
exception of podman version 2.2.1, which does
not work with Ceph. There is also a note regarding
kubic stable 3.0.1 working, but only with newer
kernels.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 3043aaaa8a880107fab9a755df948c0e9e8db358)

4 years agomgr/cephadm: check hostname resolution before adding host
Daniel Pivonka [Mon, 19 Apr 2021 21:21:06 +0000 (17:21 -0400)]
mgr/cephadm: check hostname resolution before adding host

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

4 years agocephadm: provide a way to checkhost connection without /etc/hosts passed the shell
Daniel Pivonka [Mon, 19 Apr 2021 21:18:55 +0000 (17:18 -0400)]
cephadm: provide a way to checkhost connection without /etc/hosts passed the shell

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

4 years agodoc/cephadm: remove /etc/hosts from list of hostname resoltion methods
Daniel Pivonka [Mon, 19 Apr 2021 21:15:44 +0000 (17:15 -0400)]
doc/cephadm: remove /etc/hosts from list of hostname resoltion methods

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

4 years agoqa/suites/rados/cephadm/smoke-roleless: test client-keyring
Sage Weil [Thu, 22 Apr 2021 17:43:49 +0000 (13:43 -0400)]
qa/suites/rados/cephadm/smoke-roleless: test client-keyring

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit e41931d042a1ae854523fc6229c749f0dcc563f4)

4 years agoqa/tasks/cephadm.py: adjust client.admin key mode; place on all hosts
Sage Weil [Mon, 26 Apr 2021 13:00:11 +0000 (09:00 -0400)]
qa/tasks/cephadm.py: adjust client.admin key mode; place on all hosts

Except during upgrades, since it is not supported there.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit b0dcaf2cfa02be0695ec8be4cadeaee465a5b2fb)

4 years agocephadm: distribute client.admin keyring+conf to label:_admin on bootstrap
Sage Weil [Thu, 22 Apr 2021 12:12:49 +0000 (08:12 -0400)]
cephadm: distribute client.admin keyring+conf to label:_admin on bootstrap

If we are placing ceph.conf in /etc/ceph (the default), tell the cluster
to continue doing this going forward to hosts with the '_admin' label.

This doesn't induce the user to add the admin label to other hosts too,
unfortunately--e probably want them to add the admin label to other mons,
for instance--but it is a start.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 08d21ccc949aa19c08c7e806a5b58c0180f5cbe2)

4 years agodoc/cephadm: document the default 'admin' label
Sage Weil [Thu, 22 Apr 2021 17:32:50 +0000 (13:32 -0400)]
doc/cephadm: document the default 'admin' label

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit b6b85edfe5f1dacd84ed96b4dd0980b5d1774302)

4 years agomgr/cephadm: 'ceph orch client-keyring ...' commands to manage keyring files
Sage Weil [Wed, 21 Apr 2021 17:06:21 +0000 (13:06 -0400)]
mgr/cephadm: 'ceph orch client-keyring ...' commands to manage keyring files

Teach cephadm to manage keyring files on cluster hosts.  These keys must
already exist in the mon auth database--cephadm does not create them if
they don't exist (and will issue warnings to the log if they do not).

A ceph.conf is pushed implicitly along with the keyring file.

Each keyring added will be pushed to the hosts described by the placement
spec with the appropriate ownership and mode.  If the ownership, mode, or
path are modified, the files are rewritten or removed as need.

If the client-keyring entry is removed, the keyring files are removed.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit b7e4f6017875dfbe6dc914136c7de64c8c71254e)

4 years agomgr/cephadm: reimplement ceph.conf pushing
Sage Weil [Tue, 20 Apr 2021 22:19:26 +0000 (18:19 -0400)]
mgr/cephadm: reimplement ceph.conf pushing

Use a more generic inventory map of paths to digests to track what we've
pushed.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 77411e7df313f1488e9636c871973818474f9401)

4 years agomgr/cephadm: use _write_remote_file for ceph.conf
Sage Weil [Tue, 20 Apr 2021 22:19:00 +0000 (18:19 -0400)]
mgr/cephadm: use _write_remote_file for ceph.conf

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 67718f53d189a9afa5fc48016df7c3acdbea5899)

4 years agomgr/cephadm: _write_remote_file helper
Sage Weil [Tue, 20 Apr 2021 22:18:46 +0000 (18:18 -0400)]
mgr/cephadm: _write_remote_file helper

This is careful is ownership, mode, and fsyncs before renaming into
position.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 64926f3da07b821ef394abb36321917327c82806)

4 years agomgr/cephadm: add placementspec for which hosts get ceph.conf
Sage Weil [Tue, 20 Apr 2021 16:58:13 +0000 (12:58 -0400)]
mgr/cephadm: add placementspec for which hosts get ceph.conf

Add a config option to control which hosts (by default, *) get a
ceph.conf (if the bool manage_etc_ceph_ceph_conf option is enabled).

We don't modify the existing option because changing a type makes for a
messy migration: we have to sort out which section the config option is
in to change it.  Also, a simple on/off which is more friendly than
specifying "*" to enable something.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit f1096030d9b6caeeaf7c1982b770b5f3fbe913bc)

4 years agomgr/cephadm: skip ok-to-stop for mons in upgrade if < 3 mons
Adam King [Thu, 22 Apr 2021 21:39:32 +0000 (17:39 -0400)]
mgr/cephadm: skip ok-to-stop for mons in upgrade if < 3 mons

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

4 years agomgr/cephadm: don't allow upgrade start with less than 2 mgrs
Adam King [Thu, 22 Apr 2021 19:00:44 +0000 (15:00 -0400)]
mgr/cephadm: don't allow upgrade start with less than 2 mgrs

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

4 years agocephadm: re-assimilate user provided conf after mgr created
Adam King [Tue, 27 Apr 2021 18:32:05 +0000 (14:32 -0400)]
cephadm: re-assimilate user provided conf after mgr created

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

4 years agocephadm: allow several public networks be matched
Stanislav Datskevych [Tue, 27 Apr 2021 06:16:33 +0000 (08:16 +0200)]
cephadm: allow several public networks be matched

Fixes: https://tracker.ceph.com/issues/50548
Signed-off-by: Stanislav Datskevych <me@nek0.net>
(cherry picked from commit cdd7d20b35676c4627a5caa58e4838fc59e57554)

4 years agomgr/cephadm: The command of 'ceph orch daemon restart mgr.xxx' may case mgr daemon...
jianglong01 [Fri, 23 Apr 2021 10:10:30 +0000 (18:10 +0800)]
mgr/cephadm: The command of 'ceph orch daemon restart mgr.xxx' may case mgr daemon loop to restart
Scene:
The mgr daemon is active. After execing restart command, it may be save "scheduled_daemon_actions": {"mgr.xxx": "restart"}}" to config-key.
So the mgr daemon will restart before call rm_scheduled_daemon_action which case mgr daemon will load restart forever.

Fix mgr infinite restart issue refering to the same solution as 'ceph orch daemon redeploy'.

Signed-off-by: jianglong01 <jianglong01@qianxin.com>
(cherry picked from commit cc5b77ee870e60c2c9d241d5826810eedb295e26)

4 years agodoc/cephadm: add a single word
Zac Dover [Mon, 26 Apr 2021 14:32:21 +0000 (00:32 +1000)]
doc/cephadm: add a single word

s/If the nfs-ganesha doesn't/If the
nfs-ganesha pool doesn't/

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 3af9fe3fd8de16e2b2766fd5c7b19ccb4583e5db)

4 years agodoc/cephadm: adding "device" to a sentence
Zac Dover [Thu, 22 Apr 2021 17:36:59 +0000 (03:36 +1000)]
doc/cephadm: adding "device" to a sentence

This tiny PR fixes an issue that I thought
I had squashed into PR#40914: a missing
word, "device", which was caught by Josh
Durgin during review.

Alas. I had not then caught it.

Here then it is, corrected at last.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 72445fb724044e42a1ceacbbf076ea3b8a88e2ae)

4 years agodoc/cephadm: rewrite "nfs.rst"
Zac Dover [Mon, 26 Apr 2021 13:04:04 +0000 (23:04 +1000)]
doc/cephadm: rewrite "nfs.rst"

This PR makes a few (very small) stylistic
corrections, mostly typographical, to the text.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 36426d6df56cadb33f20605a47e369bd8c01a813)

4 years agomgr/cephadm: s/_hosts_with_daemon_inventory/_schedulable_hosts/
Kefu Chai [Sat, 24 Apr 2021 07:37:43 +0000 (15:37 +0800)]
mgr/cephadm: s/_hosts_with_daemon_inventory/_schedulable_hosts/

`_hosts_with_daemon_inventory` was renamed to `_schedulable_hosts`
in f260c48f723641a5f82c64c0e31451199aa191f8 which was merged before
eebb842d0487660c93baf9eafda28a2f87e482f3 got merged, hence the
regression.

this change just updates the test with the new method name.

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

4 years agomgr/cephadm: don't remove daemons from hosts in maintenance or offline mode
Adam King [Wed, 14 Apr 2021 19:29:58 +0000 (15:29 -0400)]
mgr/cephadm: don't remove daemons from hosts in maintenance or offline  mode

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

4 years agomgr/cephadm: default status for daemons on maintenance hosts to stopped
Adam King [Wed, 14 Apr 2021 20:07:46 +0000 (16:07 -0400)]
mgr/cephadm: default status for daemons on maintenance hosts to stopped

we do not refresh the daemons on maintenance hosts so our info
on them is always outdated. Therefore, the best option is to
assume maintenance mode is working correctly and the daemons
are stopped

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 56641742a75bc753b473209b63fcefabcde7615b)

4 years agoqa/tasks/cephadm: fix ctx archive check for teuthology
Deepika Upadhyay [Mon, 19 Apr 2021 14:18:47 +0000 (19:48 +0530)]
qa/tasks/cephadm: fix ctx archive check for teuthology

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

4 years agopython-common: use OrderedDict instead of Set to remove duplicates from host labels...
Daniel Pivonka [Tue, 20 Apr 2021 19:30:28 +0000 (15:30 -0400)]
python-common: use OrderedDict instead of Set to remove duplicates from host labels list

this preserves the order of the list instead of randomizing the order

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

4 years agomgr/cephadm: less noise about osd specs
Sage Weil [Tue, 20 Apr 2021 14:27:40 +0000 (10:27 -0400)]
mgr/cephadm: less noise about osd specs

We don't want this message every time around the serve() loop

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 98c8baf165445ee06de9cbbe2e9c6c337a397681)

4 years agomgr/cephadm: kick serve loop when adding/removing labels
Sage Weil [Tue, 20 Apr 2021 14:26:08 +0000 (10:26 -0400)]
mgr/cephadm: kick serve loop when adding/removing labels

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 695dc80535a389dd58d9ebbe9239855ea948e571)

4 years agomgr/cephadm: do not place osds on _no_schedule hosts
Sage Weil [Tue, 20 Apr 2021 14:08:56 +0000 (10:08 -0400)]
mgr/cephadm: do not place osds on _no_schedule hosts

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit f5cee666d2277fcf06c15930dc00617b86aa0c0e)

4 years agodoc/cephadm: document _no_schedule label
Sage Weil [Tue, 20 Apr 2021 14:07:03 +0000 (10:07 -0400)]
doc/cephadm: document _no_schedule label

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit c7dae3ceb78999e4b06d108a43cedf2b2693c273)

4 years agomgr/cephadm: fix 'orch ls' count to reflect schedulable hosts
Sage Weil [Tue, 20 Apr 2021 14:01:33 +0000 (10:01 -0400)]
mgr/cephadm: fix 'orch ls' count to reflect schedulable hosts

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit ba135842e359fe6991e35d7177cfe3eac31af16d)

4 years agomgr/cephadm: do not schedule on _no_schedule hosts
Sage Weil [Tue, 20 Apr 2021 14:01:22 +0000 (10:01 -0400)]
mgr/cephadm: do not schedule on _no_schedule hosts

Reuse and rename existing helper to return schedulable hosts.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit f260c48f723641a5f82c64c0e31451199aa191f8)

4 years agodoc/cephadm: osd.rst -- removing colons
Zac Dover [Wed, 21 Apr 2021 18:14:24 +0000 (04:14 +1000)]
doc/cephadm: osd.rst -- removing colons

This PR removes colons that weren't necessary.
This is a companion PR to PR#40996.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 8648e04a6eb69eba0c2813a93fde010605483131)

4 years agodoc/cephadm: osd: rewrite "additional opts"
Zac Dover [Wed, 21 Apr 2021 15:01:01 +0000 (01:01 +1000)]
doc/cephadm: osd: rewrite "additional opts"

This PR rewrites the "Additional Options"
subsection of the OSD chapter of the cephadm
guide.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 91de0becbd5b9e571a98b790da5d8dc5522f5446)

4 years agodoc/cephadm: rewrite "advanced osd s. specs"
Zac Dover [Mon, 19 Apr 2021 14:38:44 +0000 (00:38 +1000)]
doc/cephadm: rewrite "advanced osd s. specs"

This PR improves the readbility and elegance of
the "Advanced OSD Service Specifications" section
of the OSD chapter of the cephadm guide.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 4106e331fb0c828f3fa455558b63c3626b77a499)

4 years agodoc/cephadm: rewrite "delcarative state" in osd.rst
Zac Dover [Wed, 24 Mar 2021 17:21:59 +0000 (03:21 +1000)]
doc/cephadm: rewrite "delcarative state" in osd.rst

This commit improves the wording of the "Declarative
State" section of the "OSD Service" chapter of the
Cephadm Guide.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 9f2d892cc150cbbecc60d4c0d0ffb9544f5acc40)

4 years agomgr/MgrStandby: fix config observer
Sage Weil [Fri, 16 Apr 2021 18:58:34 +0000 (14:58 -0400)]
mgr/MgrStandby: fix config observer

Otherwise handle_conf_change() is never called.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 73af779d314902f2af9d62e86a5adb17fb9f5d00)

4 years agomgr/MgrStandby: respawn if mgr_standby_modules changes
Sage Weil [Fri, 16 Apr 2021 16:12:01 +0000 (12:12 -0400)]
mgr/MgrStandby: respawn if mgr_standby_modules changes

If we have standby modules and this goes false, or do not have modules
and this goes true, then respawn.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit efc29fb3630aaab4e04d99621c40561d38a99c03)

4 years agoqa/tasks/mgr/test_dashboard: skip test_standby if mgr_standby_modules=false
Sage Weil [Tue, 13 Apr 2021 22:47:05 +0000 (18:47 -0400)]
qa/tasks/mgr/test_dashboard: skip test_standby if mgr_standby_modules=false

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit a2c9333a0b5ed061839aa798f8293c5fcdc6e7f5)

4 years agoqa/suites/rados/cephadm/smoke-*: use cephadm.wait_for_service
Sage Weil [Tue, 13 Apr 2021 16:53:24 +0000 (12:53 -0400)]
qa/suites/rados/cephadm/smoke-*: use cephadm.wait_for_service

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 9c1f1288857814cd417f3b88d934b9bb0f8cfb7f)

4 years agoqa/suites/rados/cephadm/smoke-singlehost: test --single-host-defaults
Sage Weil [Tue, 13 Apr 2021 16:09:26 +0000 (12:09 -0400)]
qa/suites/rados/cephadm/smoke-singlehost: test --single-host-defaults

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit c20323d114e6c8072ecdf26f77a58ae734d38d0e)

4 years agocephadm: add --single-host-defaults option to bootstrap
Sage Weil [Mon, 12 Apr 2021 15:51:33 +0000 (11:51 -0400)]
cephadm: add --single-host-defaults option to bootstrap

[global] osd_crush_choose_leaf_type = 0
[global] osd_pool_default_size = 2
[mgr] mgr_standby_modules = false

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit ae899d37692284c7991229a7a47a2fce1bfbeca7)

4 years agomgr/cephadm: allow mgr colo if mgr_standby_modules=false
Sage Weil [Mon, 12 Apr 2021 14:17:17 +0000 (10:17 -0400)]
mgr/cephadm: allow mgr colo if mgr_standby_modules=false

If the standby mgr daemons' modules aren't listening on any ports, then we
can schedule multiple on the same host.

Note that this may make 'orch ps' output misleading, as ports will be
reported for each mgr instance, but only one of them will actually be
listening at any one time (if they are behaving, at least!).  Treat a
mgr port check error as non-fatal.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 77e0f5b45c6c33c6c4d857bfab3e33ec8d9ed51c)

4 years agomgr/MgrStandby: add mgr_standby_modules option
Sage Weil [Tue, 4 May 2021 14:57:16 +0000 (09:57 -0500)]
mgr/MgrStandby: add mgr_standby_modules option

Add config option to control whether the standby modules are started.
Default to true (no change in behavior), but if set to false the standby
mgr modules don't do the redirect business.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 35d2146c1a801a2b478a19b9d62af0f10279fd34)

# Conflicts:
# src/common/options/global.yaml.in
 - added to options.cc instead

4 years agocephadm: ignore apparmor if profiles file is empty
Joao Eduardo Luis [Wed, 31 Mar 2021 14:05:45 +0000 (14:05 +0000)]
cephadm: ignore apparmor if profiles file is empty

Signed-off-by: Joao Eduardo Luis <joao@suse.com>
(cherry picked from commit 8395885794df85a6141da80d4e7a13873c3f6770)

4 years agomgr/dashboard:OSDs placement text is unreadable 41096/head
Aashish Sharma [Thu, 29 Apr 2021 12:57:59 +0000 (18:27 +0530)]
mgr/dashboard:OSDs placement text is unreadable

While displaying the host pattern in the OSDs placement tab, it gets splited with semi-colons. Also adjusted the column size of Container Image ID and Placement columns.

Fixes: https://tracker.ceph.com/issues/50580
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit 543b02436f18876a56757226c686a5c2c33c7c33)

4 years agoosd: drop entry in failure_pending when resetting stale peer 41090/head
Kefu Chai [Sun, 14 Mar 2021 03:56:59 +0000 (11:56 +0800)]
osd: drop entry in failure_pending when resetting stale peer

no need to keep it in the pending list anymore.

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

4 years agoosd: mark HeartbeatInfo::is_stale() and friends "const"
Kefu Chai [Sun, 14 Mar 2021 03:56:06 +0000 (11:56 +0800)]
osd: mark HeartbeatInfo::is_stale() and friends "const"

just for more const correctness.

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

4 years agomon/OSDMonitor: drop stale failure_info
Kefu Chai [Thu, 11 Mar 2021 13:13:13 +0000 (21:13 +0800)]
mon/OSDMonitor: drop stale failure_info

failure_info keeps strong references of the MOSDFailure messages
sent by osd or peon monitors, whenever monitor starts to handle
an MOSDFailure message, it registers it in its OpTracker. and
the failure report messageis unregistered when monitor acks them
by either canceling them or replying the reporters with a new
osdmap marking the target osd down. but if this does not happen,
the failure reports just pile up in OpTracker. and monitor considers
them as slow ops. and they are reported as SLOW_OPS health warning.

in theory, it does not take long to mark an unresponsive osd down if
we have enough reporters. but there is chance, that a reporter fails
to cancel its report before it reboots, and the monitor also fails
to collect enough reports and mark the target osd down. so the
target osd never gets an osdmap marking it down, so it won't send
an alive message to monitor to fix this.

in this change, we check for the stale failure info in tick(), and
simply drop the stale reports. so the messages can released and
marked "done".

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

4 years agomon/OSDMonitor: restructure OSDMonitor::check_failures() loop
Kefu Chai [Thu, 11 Mar 2021 10:28:18 +0000 (18:28 +0800)]
mon/OSDMonitor: restructure OSDMonitor::check_failures() loop

will add a trim failures call in the loop, which mutates failure_info,
while we are still iterating this map. so have to restructure the loop
a little bit.

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

4 years agomon/OSDMonitor: extract get_grace_time()
Kefu Chai [Thu, 11 Mar 2021 11:49:36 +0000 (19:49 +0800)]
mon/OSDMonitor: extract get_grace_time()

for better readability

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

4 years agomon/OSDMonitor: do not return old failure report when updating it
Kefu Chai [Thu, 11 Mar 2021 09:47:50 +0000 (17:47 +0800)]
mon/OSDMonitor: do not return old failure report when updating it

there is no need to return stale report, as the caller is not interested
in it.

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

4 years agomon/OSDMonitor: do not return no_reply() again
Kefu Chai [Thu, 11 Mar 2021 09:45:49 +0000 (17:45 +0800)]
mon/OSDMonitor: do not return no_reply() again

we always return "no_op" message to proxy monitor in
`OSDMonitor::prepare_failure()` at the very beginning of this method. so
no need to reply the peon again when discarding the failure report.

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

4 years agomon/Monitor: early return if routed request is not found
Kefu Chai [Thu, 11 Mar 2021 09:09:57 +0000 (17:09 +0800)]
mon/Monitor: early return if routed request is not found

* early return if routed request is not found in routed_requests.
  reduce the indent level, for better readability.
* do not look up the request twice. for better performance.
* use unique_ptr<> for holding the request, for better readability

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

4 years agopybind/mgr/devicehealth: fix command name 41089/head
Patrick Donnelly [Mon, 12 Apr 2021 17:33:57 +0000 (10:33 -0700)]
pybind/mgr/devicehealth: fix command name

Regression: 61bb1691f453a137cf4d50467af233fd3db7f897
Fixes: https://tracker.ceph.com/issues/50304
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 05c0ddbb011a3e7d5ca998331b82720acc05c9cf)

4 years agoMerge PR #40922 into pacific
Sage Weil [Wed, 28 Apr 2021 15:44:21 +0000 (10:44 -0500)]
Merge PR #40922 into pacific

* refs/pull/40922/head:
pybind/ceph_argparse: print --format flag name in help descs
mgr/cephadm: don't list non ceph daemons as needing upgrade in upgrade check
qa/tasks/cephadm: ignore --keep-logs failure
qa/tasks/cephadm: use yaml.dump_all()
qa/suites/rados/cephadm/smoke-*: use cephadm.wait_for_service
qa/tasks/cephadm: tear down clsuter before gathering logs
qa/suites/rados/cephadm/smoke-roleless: test rgw-ingress
mgr/cephadm: remove virtual_ip check during scheduling
mgr/orchestrator: orch ls: leave off virtual_ip prefixlen
qa/tasks/cephadm: add wait_for_service
qa/tasks/cephadm: allow skip_monitor_stack=true
qa/tasks/cephadm: do subst_vip for cephadm.shell and .apply
qa/tasks/vip: add vip task to allocate virtual IPs
qa/suites/rados/cephadm/smoke-roleless: add rgw-ingress test case
qa/tasks/cephadm: shell: take 'all-roles' or 'all-hosts'
qa/tasks/cephadm: let cephadm.shell take string or list
doc/cephadm: wrong command for single daemon events
mgr/cephadm: place maximum on placement count based on host count
mgr/cephadm: fix nfs-rgw stray daemon
mgr/cephadm: skip-ssh flag enables cephadm mgr module
mgr/cephadm: report exception during upgrade in upgrade status
qa/suites/rados/thrash: shorten radosbench
mgr/cephadm: remove old haproxy and keepalived templates
mgr/orchestrator: validate lists in spec jsons
python-common: Verify service spec is not None
python-common: Verify data_devices is not None
mgr/orchestrator: DG loads properly the unmanaged attribute
mgr/orchestractor: rgw realm and zone flags must both be provided
mgr/cephadm: make prometheus scrape ingress haproxy
doc/cephadm: remove big warning about stability
doc/cepham/compatibility: rgw-ha -> ingress; note possibility of breaking changes
doc/cephadm: rewrite "dry run" section in osd.rst
doc/cephadm: rewrite part of "deploy osds"
doc/cephadm: rewrite osd.rst "Remove an OSD"
doc/cephadm: rewrite osd.rst - list devices
doc/cephadm: break mon section into sections
doc/cephadm: rewrite "deploying add. mons"
doc: fixes for cephadm documentation
doc/cephadm: remove warning about cephadm in production
doc/cephadm: Add Compatibility with Podman Versions
doc/cephadm: rewrite "index.rst"
doc/cephadm: explicitly show host requirments in adding host section
mgr/cephadm: ingress: add optional virtual_interface_networks
doc/cephadm/rgw: clean up example spec
mgr/cephadm/services/ingress: less verbose about prepare_create
doc/cephadm/rgw: add note about which ethernet interface is used
cephadm: make keepalived unit fiddle sysctl settings
mgr/orchestrator: report external endpoints from 'orch ls'
mgr/orchestrator: drop - when no ports
doc/cephadm/rgw: update docs for ingress service
mgr/cephadm: use per_host_daemon feature in scheduler
cephadm: fix a typo
mgr/cephadm/schedule: add per_host_daemon_type support
mgr/cephadm: HA_RGW -> Ingress
mgr/cephadm: include daemon_type in DaemonPlacement
mgr/cephadm: update list-networks to report interface names too
mgr/orchestrator: streamline 'orch ps' PORTS formatting
mgr/cephadm/schedule: handle multiple ports per daemon
mgr/cephadm/utils: resolve_ip(): prefer IPv4
cephadm: cleanup extra slash in runtime dir
cephadm: use split cgroup strategy for podman
cephadm: use class to represent container engine
mgr/cephadm: don't cleanup the daemon keyring on failed redeploy
mgr/cephadm: fix orch host add with multiple labels and no addr
doc/cephadm: remove keepalived_user from haproxy docs
rpm: re-disable SUSE lttng build on z390x
ceph.spec.in: enable tcmalloc and lttng on s390x

Reviewed-by: Sebastian Wagner <swagner@suse.com>
4 years agomgr/dashboard: set required env. variables in run-backend-api-tests.sh 41069/head
Alfonso Martínez [Thu, 22 Apr 2021 15:02:27 +0000 (17:02 +0200)]
mgr/dashboard: set required env. variables in run-backend-api-tests.sh

Fixes: https://tracker.ceph.com/issues/50484
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit f0ded7b0069577cc912ba6840f27c435b266b68a)

4 years agoMerge pull request #41054 from leseb/bkp-41032
Sébastien Han [Wed, 28 Apr 2021 12:33:48 +0000 (14:33 +0200)]
Merge pull request #41054 from leseb/bkp-41032

pacific: ceph-volume: fix "device" output

4 years agomgr/dashboard: Host Maintenance Follow ups 41056/head
Nizamudeen A [Fri, 26 Mar 2021 07:57:40 +0000 (13:27 +0530)]
mgr/dashboard: Host Maintenance Follow ups

Added the ability to create a host in maintenance mode

Fixes: https://tracker.ceph.com/issues/49998
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 23bdf201c4bfac4628c27cc9a9dc749ad277a563)

4 years agoceph-volume: fix "device" output 41054/head
Sébastien Han [Mon, 26 Apr 2021 16:01:19 +0000 (18:01 +0200)]
ceph-volume: fix "device" output

During
https://github.com/ceph/ceph/commit/ec0f5f3b22d24754c16131a1996e42b787e4255f
I changed "device" by "dev", let's revert that!

Fixes: https://tracker.ceph.com/issues/50478
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit da1f9d215fa9e86fa30d82de7032df05c6cbefb1)

4 years agoMerge pull request #40612 from rhcs-dashboard/wip-50145-pacific
Ernesto Puerta [Tue, 27 Apr 2021 17:22:25 +0000 (19:22 +0200)]
Merge pull request #40612 from rhcs-dashboard/wip-50145-pacific

pacific: qa/tasks/vstart_runner.py: start max required mgrs

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: rishabh-d-dave <NOT@FOUND>
4 years agoMerge pull request #40887 from rhcs-dashboard/wip-50350-pacific
Ernesto Puerta [Tue, 27 Apr 2021 17:20:35 +0000 (19:20 +0200)]
Merge pull request #40887 from rhcs-dashboard/wip-50350-pacific

pacific: mgr/dashboard: improve telemetry opt-in reminder notification message

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
4 years agoMerge pull request #40929 from rhcs-dashboard/wip-49658-pacific
Ernesto Puerta [Tue, 27 Apr 2021 17:16:43 +0000 (19:16 +0200)]
Merge pull request #40929 from rhcs-dashboard/wip-49658-pacific

pacific: mgr/dashboard: test prometheus rules through promtool

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #40815 from rhcs-dashboard/wip-50171-pacific
Ernesto Puerta [Tue, 27 Apr 2021 17:07:07 +0000 (19:07 +0200)]
Merge pull request #40815 from rhcs-dashboard/wip-50171-pacific

pacific: mgr/dashboard: debug nodeenv hangs

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>