Commit Graph

61 Commits

Author SHA1 Message Date
Sebastian Wagner
de448fafe0 cephadm: Update images used
Print warning when using cephadm from master

See also "use quay octopus tip until 15.2 tag is available"
* a9b15c7e1a.

See also  "update default container images"
* 1f05f75787.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-04-14 16:05:14 +02:00
Michael Fritch
7e26083d92
qa/workunits/cephadm/test_cephadm.sh: use fsid during dump_log
needed when running with multiple ceph clusters

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-04-08 14:39:50 -06:00
Michael Fritch
3848ec26bf
qa/workunits/cephadm/test_cephadm.sh: add fsid to ceph-volume cmds
needed when testing with a multi-cluster setup

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-04-07 15:27:35 -06:00
Jan Fajerski
ed0db2445f qa/workunits/cephadm: create lvs before calling cephadm
Fixes: https://tracker.ceph.com/issues/44682

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2020-03-24 16:37:27 +01:00
Sage Weil
de20c7bc61 Merge PR #34105 into master
* refs/pull/34105/head:
	Merge PR #34042 into octopus
	Merge PR #33959 into octopus
	Merge PR #34067 into octopus
	mgr/DaemonServer: add explicit check that acting matches for merge
	Merge pull request #34040 from dillaman/wip-44396-partial-fix
	Merge PR #34098 into octopus
	mgr/rook: list rgw services
	mgr/rook: tolerate timestamps that are None
	mgr/orch: add 'subcluster' property to RGWSpec
	mgr/rook: do not create radosgw pools
	mgr/rook: refactor apply/add for rgw
	Merge PR #34082 into octopus
	Merge PR #34068 into octopus
	cephadm: relabel /etc/ganesha mount
	Merge PR #34046 into octopus
	Merge PR #34092 into octopus
	Merge pull request #33719 from ukernel/wip-44416
	rbd-mirror: leader watcher should not cancel get locker if locker is invalid
	rbd-mirror: snapshot sync request needs to check for interruption
	librbd: request exclusive lock when moving to trash
	rbd-mirror: basic integration with sync throttling
	rbd-mirror: don't prematurely finish snapshot replay loop
	rbd-mirror: pass InstanceWatcher to snapshot Replayer
	doc/releases/octopus.rst: add note about ec recovery below min_size
	mgr/cephadm: configure rgw_frontends for rgw service
	cephadm: switch grafana image to the ceph repo
	Merge PR #34034 into octopus
	qa/suites/rados/cephadm/upgrade: update starting version
	Merge PR #33540 into octopus
	Merge PR #34023 into octopus
	Merge PR #34044 into octopus
	Merge PR #34030 into octopus
	doc/orchestrator: update rgw creation
	mgr/cephadm: clean up client.crash.* container_image settings after upgrade
	cephadm: make add-repo --release and --version independent
	cephadm: env over last used
	mgr/orch: accept port and ssl flags to 'apply rgw'
	mgr/orch: 'ceph upgrade ...' -> 'ceph orch upgrade ...'
	cephadm: fall back to default for infer_image
	cephadm: remove outdated check
	cephadm: consolidate default image logic
	remove ceph_test_rados_watch_notify
	python-common/ceph/deployment/service_spec: add ssl to RGWSpec
	cephadm: only infer image for shell, run, inspect-image, pull, ceph-volume
	mgr/test_orchestrator: fix service filtering when using dummy data
	mgr/dashboard: fix adding/removing host errors
	mgr/rook: fix 'orch ps' for osds
	qa: fix all the fsx.sh-invoking yaml files to install dependencies
	mds: pass proper MutationImpl::LockOp to Locker::wrlock_start()

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
2020-03-23 08:24:06 -05:00
Kefu Chai
71f6db5f6b
Merge pull request #34066 from mgfritch/cephadm-mon-b-test
qa/workunits/cephadm/test_cephadm.sh: fix mon.b failure

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2020-03-21 14:34:28 +08:00
Michael Fritch
26b7a3f819
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>
2020-03-20 07:55:26 -06:00
Sage Weil
f64de8f475 Merge PR #34034 into octopus
* refs/pull/34034/head:
	cephadm: make add-repo --release and --version independent

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-03-20 08:12:50 -05:00
Michael Fritch
90cb2feec3
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>
2020-03-19 14:16:01 -06:00
Sage Weil
e1c39fbfec cephadm: make add-repo --release and --version independent
Specify either --release name (to get the latest) or --version x.y.z to
get a specific version.

Adapt to updated locations on download.ceph.com so that we don't need to
know the release name for a specific x.y.z release.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-19 08:09:21 -05:00
Sage Weil
acbda9d19d qa/workunits/cephadm/test_cephadm: mark services unmanaged for test
We are deploying containers manually.  Mark them unmanaged so that we
do not fight against mgr/cephadm cleaning up orphan daemons.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-18 10:44:42 -05:00
Sage Weil
ee108d4395 qa/workunits/cephadm/test_cephadm: output file for pub key
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-18 08:44:10 -05:00
Sage Weil
1e25680552 Merge PR #34013 into octopus
* refs/pull/34013/head:
	qa/workunits/cephadm/test_cephadm: --skip-monitoring-stack

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-03-18 08:13:56 -05:00
Sage Weil
8630b1a814 qa/workunits/cephadm/test_cephadm: --skip-monitoring-stack
We're deploying these things manually later, and they use fixed ports.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-17 14:53:58 -05:00
Sage Weil
a9b15c7e1a update default container images
- For tests, use bleeding-edge octopus branch
- For production defaults, use ceph/ceph:v15.2 tag
- For bootstrap, grab cephadm script from latest octopus branch

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-16 20:53:57 -05:00
Sage Weil
ccf85a1fef Merge PR #33952 into octopus
* refs/pull/33952/head:
	qa/workunits/cephadm: --skip-mon-network when using 127.0.0.1
	cephadm: add tests
	qa/tasks/cephadm: pass -v to bootstrap
	mgr/cephadm: only try to place mons on hosts matching public_network
	mgr/cephadm: keep track of host networks, ips
	cephadm: automatically infer mon public_network, if we can
	cephadm: add list-networks command

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-03-16 17:36:43 -05:00
Sage Weil
8ab7a91615 qa/workunits/cephadm: --skip-mon-network when using 127.0.0.1
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-16 14:38:22 -05:00
Sage Weil
f979dd1ebf cephadm: implement 'install' command
This was present, but a no-op.

By default, install cephadm.

Optionally take a list of packages to install instead (e.g., ceph-common).

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-16 08:24:36 -05:00
Joshua Schmid
dcc76d36ff mgr/cephadm: adapt qa->test_cephadm.sh
Signed-off-by: Joshua Schmid <jschmid@suse.de>
2020-03-13 09:52:13 +01:00
Michael Fritch
8543e2e50b
qa/workunits/cephadm/test_cephadm.sh: systemctl stop nfs-server
stop any running nfs servers before attempting a deploy of nfs-ganesha

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:08:59 -06:00
Michael Fritch
606b79b19f
qa/workunits/cephadm/test_cephadm.sh: make pgs available
allow rados obj. create to succeed during a single node test

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:08:59 -06:00
Michael Fritch
71ee086368
qa/workunits/cephadm/test_cephadm.sh: add nfs-ganesha test
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-03-12 08:03:18 -06:00
Michael Fritch
5bdcf00e87
qa/workunits/cephadm/test_cephadm.sh: dump logs on exit
dumps the last few lines from each of the surviving daemon logs

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-02-28 15:26:56 -07:00
Michael Fritch
3cc2fc9f5f
qa/workunits/cephadm/test_cephadm.sh: add cleanup function
moves logic for clean-up during `trap EXIT` into a function

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-02-28 14:45:42 -07:00
Michael Fritch
2d46185c20
qa/workunits/cephadm/test_cephadm.sh: remove image param non-ceph tests
non-ceph components have a default image
as of 97def7cb60

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-02-25 20:49:58 -07:00
Michael Fritch
ea5f639485
qa/workunits/cephadm/test_cephadm.sh: consolidate wait loop logic
into an `is_available` function

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-02-25 20:49:23 -07:00
Sage Weil
d1893df0e1 qa/workunits/cephadm/test_adoption: run as root
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-23 11:58:25 -06:00
Sage Weil
12fe1a1c17 qa/workunits/cephadm: separate out test_adoption.sh; fix
- fix adoption test to handle different legacy fsids
- separate it out into a different script

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-21 07:17:47 -06:00
Sage Weil
77246cb0a4 cephadm: include docker.io in image name
This removes a configuration dependency on the container environment.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-19 07:10:59 -06:00
Sage Weil
92b49094e7 cephadm: avoid trigger old podman bug
This ticket seems to suggest that (1) the root cause is related to an
exec that is orphaned and screws up the container state (due to, e.g., ssh
dropping, or a timeout), (2) -f may be needed, sometimes, to recover, and
(3) newer versions fix it.

  https://github.com/containers/libpod/issues/3226

Way back in 26f9fe54cb we found that using
-f the first time around was a Bad Idea, so we'd rather avoid this.

Instead, just avoid triggering the bug.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-12 13:59:23 -06:00
Sage Weil
1f5e59d294 qa/workunits/cephadm/test_cephadm.sh: wait longer for grafana
Sometimes it is very slow to start (only on 18.04, strangely?).

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-12 13:59:23 -06:00
Sage Weil
d466f6f2d9 Merge PR #33191 into master
* refs/pull/33191/head:
	cephadm: shell: allow -e

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-02-11 17:25:21 -06:00
Sage Weil
3346765dd0 cephadm: shell: allow -e
Set environment variables for shell commands.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-11 15:52:07 -06:00
Sage Weil
9243a502c8 Merge PR #33181 into master
* refs/pull/33181/head:
	qa/workunits/cephadm/test_cephadm: fix typo

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-02-10 13:29:08 -06:00
Sage Weil
20205e70c4 mgr/orch: 'ceph orchestrator ...' -> 'ceph orch ...'
Less typing for all!

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-09 15:39:57 -06:00
Sage Weil
132b5a09b6 qa/workunits/cephadm/test_cephadm: fix typo
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-09 15:38:48 -06:00
Sage Weil
ceff81c9a5 Merge PR #33136 into master
* refs/pull/33136/head:
	cephadm: fix ceph version probe

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-02-09 15:34:59 -06:00
Sage Weil
a7d5d5cc8c cephadm: fix ceph version probe
docker returns '<no value>' if the label isn't present, in which case we
still need to run ceph -v.

Also, don't probe non-ceph (e.g., monitoring) containers.

Also, only probe each image id once.

Add a simple test.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-09 14:00:50 -06:00
Sage Weil
9dba764c02 Merge PR #33133 into master
* refs/pull/33133/head:
	qa/workunits/cephadm/test_cephadm.sh: make monitoring tests faster
	qa/workunits/cephadm/test_cephadm: 2 OSDs is enough
	cephadm: disable node-exporter cpu/memory limits for the time being

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-02-09 13:55:27 -06:00
Sage Weil
36daf1cc29 qa/workunits/cephadm/test_cephadm.sh: make monitoring tests faster
The sleep 90 was way overkill.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-08 18:00:37 -06:00
Sage Weil
0594526393 qa/workunits/cephadm/test_cephadm: 2 OSDs is enough
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-08 18:00:37 -06:00
Sage Weil
8cdbc8e8e6 qa/workunits/cephadm/test_repos: don't try to use the refspec
This is usually a sha1, and we can't reliably find packages based on
that.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-08 07:33:47 -06:00
Sage Weil
fd17368e9c qa/workunits/cephadm/test_repos: apt update
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-07 22:16:29 -06:00
Sage Weil
883f82aee6 qa/workunits/cephadm/test_repos: fix subst
Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-07 21:26:03 -06:00
Sage Weil
a98855ecf5 qa/workunits/cephadm/test_repos: add test for the repo commands
This isn't a great test, but it is something.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-02-07 11:14:47 -06:00
Kefu Chai
22da7813ef
Merge pull request #33018 from mgfritch/cephadm-docker-disabled
qa/workunits/cephadm/test_cephadm.sh: skip docker when service is disabled

Reviewed-by: Sage Weil <sage@redhat.com>
2020-02-05 20:46:16 +08:00
Michael Fritch
4535216267
qa/workunits/cephadm/test_cephadm.sh: add missing monitoring tests
add tests for node-exporter, prometheus, and grafana

Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-02-02 21:08:02 -07:00
Michael Fritch
386a9eb89c
qa/workunits/cephadm/test_cephadm.sh: skip docker when service is disabled
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-01-31 10:27:07 -07:00
Michael Fritch
0d331fccdc
cephadm: remove logs command
Fixes: https://tracker.ceph.com/issues/43618
Signed-off-by: Michael Fritch <mfritch@suse.com>
2020-01-27 07:22:11 -07:00
Sebastian Wagner
bbd18f1986
Merge pull request #32049 from mgfritch/wip-cd-timeout
cephadm: add ability to specify a timeout

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-01-17 08:32:06 +01:00