Commit Graph

109 Commits

Author SHA1 Message Date
Sage Weil
9ab9cc26e2 Merge PR #41007 into master
* refs/pull/41007/head:
	qa/tasks/cephfs/test_nfs: fix info test
	doc/cephfs/fs-nfs-exports: document --ingress --virtual-ip
	mgr/nfs: move ingress vs virtual_ip check to cluster interface
	PendingReleaseNotes: clarify deprecated
	PendingReleaseNotes: note breaking CLI changes
	doc/cephadm/nfs: document nfs+ingress
	qa/suites/rados/cephadm/smoke-roleless: test nfs, nfs + ingress
	mgr/nfs: take --ingress argument to 'nfs cluster create'
	mgr/cephadm: adjust debug output for device refresh
	mgr/cephadm: ingress: fix log msg
	mgr/cephadm: fix logging of config/placement errors
	common/options: enable nfs module for new clusters
	cephadm: --stop-signal=SIGTERM
	mgr/orchestrator: default nfs pool, namespaces
	mgr/cephadm: nfs: create pool if it doesn't yet exist
	doc/cephadm/nfs: update
	mgr/nfs: change 'nfs cluster info'
	mgr/nfs: take optional virtual_ip for deploying ingress
	mgr/nfs: remove 'nfs cluster update'
	mgr/nfs: factor out ganesha pool creation
	mgr/nfs: delete -> rm for CLI
	mgr/nfs: add some type annotations
	python-common: fix IngressSpec yaml dump
	mgr/cephadm: ingress: remove eth0 default
	qa/tasks/cephadm: allow mounting volumes in shell
	cephadm: add -v arg to shell
	qa/tasks/vip: add 'vip.exec' task
	mgr/orchestrator: add --port arg to 'orch apply nfs'
	mgr/cephadm: nfs: add purge
	mgr/cephadm: ingress: support nfs
	mgr/cephadm: do not reconfigure daemons on deleted services
	mgr/cephadm: nfs: shell out to rados tool for conf creation
	mgr/cephadm: nfs: add rank to grace file from mgr module
	mgr/cephadm: nfs: bind ganesha to appropriate ip:port
	mgr/cephadm: enable ranked daemons for nfs
	mgr/cephadm: support creation of daemons with ranks
	mgr/cephadm: make _plan show removed daemon names
	mgr/cephadm/schedule: assign/map ranks
	mgr/cephadm: add rank[_generation] properties
	mgr/cephadm/inventory: store optional rank_map along with specs
	mgr/cephadm: include service_name is generated DaemonDescription
	mgr/orchestrator: include service_name in DaemonDescription dump
	mgr/cephadm/inventory: fix deleted check
	mgr/cephadm: simplify
	mgr/cephadm/schedule: make placement shuffle deterministic
	mgr/cephadm: document CephadmService flags

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
2021-05-25 16:17:44 -04:00
sunilkumarn417
364fb5899b qa/tasks/cephadm: Include bootstrap registry options for downstream
- registry-url, registry-username and registry-password bootstrap options are
supported now. This is needed to access monitoring service container images.
- usage of RHEL distribution based cephadm in download_cephadm task.

Signed-off-by: sunilkumarn417 <sunnagar@redhat.com>
2021-05-24 12:38:54 +05:30
Sage Weil
b711a75277 qa/tasks/cephadm: allow mounting volumes in shell
Signed-off-by: Sage Weil <sage@newdream.net>
2021-05-19 08:43:14 -04:00
Sage Weil
b6d1536a67 qa/tasks/cephadm: add whitespace between functions
Signed-off-by: Sage Weil <sage@newdream.net>
2021-05-18 10:05:16 -05:00
Sage Weil
267cefc040 qa/tasks/cephadm: clean up ctx.manager setup
Signed-off-by: Sage Weil <sage@newdream.net>
2021-05-14 15:02:13 -05:00
Sage Weil
75480f52e4 Merge PR #40941 into master
* refs/pull/40941/head:
	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

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Adam King <adking@redhat.com>
2021-04-28 14:26:35 -04:00
Sage Weil
b0dcaf2cfa 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>
2021-04-27 18:29:50 -04:00
Sage Weil
a5b1644660 Merge PR #40913 into master
* refs/pull/40913/head:
	qa/tasks/cephadm: fix ctx archive check for teuthology

Reviewed-by: Sage Weil <sage@redhat.com>
2021-04-22 09:50:02 -04:00
Deepika Upadhyay
ec2a402f55 qa/tasks/cephadm: fix ctx archive check for teuthology
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
2021-04-19 19:48:47 +05:30
Sage Weil
c20323d114 qa/suites/rados/cephadm/smoke-singlehost: test --single-host-defaults
Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-16 16:00:31 -04:00
Sage Weil
65f2848e97 qa/tasks/cephadm: ignore --keep-logs failure
Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-16 14:12:49 -05:00
Sage Weil
97c143c344 qa/tasks/cephadm: use yaml.dump_all()
Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-16 10:30:05 -05:00
Sage Weil
deec9074bb qa/tasks/cephadm: tear down clsuter before gathering logs
We dont' always stop all services, because teuthology doesn't know about
things it didn't start.  Use rm-cluster to tear things down, but do not
remove the logs themselves.  After we get logs, we'll clean up completely.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-16 09:49:45 -05:00
Sage Weil
ced2f7fe4a qa/tasks/cephadm: add wait_for_service
Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-16 09:49:45 -05:00
Sage Weil
bb825157dc qa/tasks/cephadm: allow skip_monitor_stack=true
(Useful for roleless when we want to go faster)

Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-16 09:49:45 -05:00
Sage Weil
0d561e2741 qa/tasks/cephadm: do subst_vip for cephadm.shell and .apply
Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-16 09:49:45 -05:00
Sage Weil
0803957695 qa/tasks/cephadm: shell: take 'all-roles' or 'all-hosts'
'all' is ambiguous

Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-16 07:36:47 -05:00
Sage Weil
779af3da6f qa/tasks/cephadm: let cephadm.shell take string or list
Make it a bit more forgiving.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-16 07:36:47 -05:00
Sage Weil
05b3ce2585 qa/tasks/cephadm: add apply() method/task
Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-05 11:44:22 -05:00
Sage Weil
a17593a177 qa/tasks/cephadm: use 'orch apply mon' to deploy mons
The 'orch daemon add ...' command is not idempotent and can cause
duplicate (and failing) attempts to add the same mon.

Maintain the ability to add mons the old way for the benefit of testing
upgrades from early octopus versions of cephadm.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-03-22 16:28:40 -05:00
Sage Weil
0a139c1ffc qa/tasks/cephadm.py: don't set mgr count to +1
Signed-off-by: Sage Weil <sage@newdream.net>
2021-03-11 14:16:15 -05:00
Sage Weil
1bfb0cd84b qa/tasks/cephadm: drop realm.zone convention for rgw
Note that cephadm.py will no longer do anything with rgw realms and
zones.  That means that the setup of rgw roles here is only useful
for the default zone and a non-multisite config.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-03-09 14:29:43 -05:00
Sage Weil
208407c5c0 qa/tasks/cephadm: remove mirror code
This is being done from ansible now.  Also, it breaks when
the conf file has unqualified-search-registries but not 'registry'
entries.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-03-04 07:39:15 -06:00
Neha Ojha
3ced450cdd Revert "qa/tasks/cephadm: use cluster.sh and remote.sh for better readibility"
This reverts commit 6d7ba1180e.

Fixes: https://tracker.ceph.com/issues/49228
Signed-off-by: Neha Ojha <nojha@redhat.com>
2021-02-09 22:15:37 +00:00
Sage Weil
5842058d12 qa/tasks/cephadm: allow custom git_url for cephadm_branch pull
Normally the git_url is git://git.ceph.com/ceph-ci.git, which mirrors
upstream ceph-ci.git.  However, the release branches aren't present there.
Allow a custom git_url so we can pull these from the main ceph.git.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-01-29 11:45:02 -06:00
Sage Weil
9eef1bcced qa/suites/rados/cephadm/upgrade: avoid allow_ptrace with old cephadm
Older cephadm is not smart enough to not combine --cap-add=SYS_PTRACE
and --privileged, which some version of podman cannot handle.

For upgrades, leave off the allow_ptrace behavior since we may be starting
on one of those old versions.

See also https://tracker.ceph.com/issues/46429

Fixes: https://tracker.ceph.com/issues/48142
Signed-off-by: Sage Weil <sage@newdream.net>
2021-01-20 16:40:17 -06:00
Neha Ojha
f3af610721 qa/tasks/cephadm.py: do not create rbd pool by default
rados/cephadm/smoke* does not use the install task and the adjust-ulimits
dependency is met as a part of it. create_rbd_pool needs adjust-ulimits,
so for now we will disable create_rbd_pool by default and only set it
to true for the upgrade suite.

Signed-off-by: Neha Ojha <nojha@redhat.com>
2021-01-06 17:35:15 +00:00
Neha Ojha
276a4fb8b0 qa/tasks/cephadm.py: create RBD pool
The ceph task already does this and a bunch of tests rely on this pool
being already present. Can be disabled by setting create_rbd_pool to False.

Signed-off-by: Neha Ojha <nojha@redhat.com>
2021-01-05 21:32:41 +00:00
Yuri Weinstein
5ab1e53221
Merge pull request #38707 from ceph/wip-yuriw-octopus-x-4-master
qa/tests: initial check in for octopus-x/parallel tests (try 2)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2020-12-23 13:09:51 -08:00
Josh Durgin
c79fa6d780 qa/tasks/cephadm: include first mgr host when applying mgrs
This prevents the first mgr from being shut down due to lack of
appropriate placements.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
2020-12-23 11:30:54 -08:00
Dan Mick
f30c55a242 qa/distros: configure podman to pull from docker-mirror
This also requires a change to cephadm.py to search for
registry entries for docker.io by 'prefix' or 'location',
and to only add the mirror if a mirror isn't already present

Signed-off-by: Dan Mick <dmick@redhat.com>
2020-12-18 09:53:50 +00:00
Deepika Upadhyay
4da3b23b89 qa/tasks/ceph: rename s/update_archive_setting/update_info_yaml
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
2020-12-03 22:08:52 +05:30
Deepika Upadhyay
6d7ba1180e qa/tasks/cephadm: use cluster.sh and remote.sh for better readibility
in extention for: 9536625558

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
2020-12-03 21:23:12 +05:30
Deepika Upadhyay
22b832e94e qa/tasks/cephadm: refactor
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
2020-12-03 21:23:12 +05:30
Deepika Upadhyay
2f0209ae43 qa/tasks/cephadm: update_info_yaml() only if ctx.archive is valid
related to: 6cd8e4b55883b2d282f101f11521a2759b3db564
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
2020-12-03 21:23:11 +05:30
Kyr Shatskyy
f75b00984e qa/task/cephadm: run cephadm only on bootstrap_remote
Because not all the node in teuthology config might
have any cephadm related role we should not execute
cephadm on random node.

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-11-11 23:17:59 +01:00
Sebastian Wagner
130c7a438e qa/cephadm: Also fetch iscsi logs
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-09-11 14:17:09 +02:00
Sebastian Wagner
430f2c5132 qa/cephadm: Add iSCSI
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2020-09-11 14:17:09 +02:00
Kyr Shatskyy
5e9cd8624e qa/tasks/cephadm: use remote.read_file instead of misc.get_file
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-09-04 00:02:16 +02:00
Kyr Shatskyy
bdb3c8a23d qa/tasks/cephadm: deprecate misc.sudo_write_file
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-09-04 00:02:15 +02:00
Neha Ojha
fb44c2f500
Merge pull request #36527 from neha-ojha/wip-whitelist-blacklist
Replace 'whitelist' and 'blacklist' language

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2020-08-25 12:24:36 -07:00
Sage Weil
2ee9365d0b qa: log-whitelist -> log-ignorelist
Signed-off-by: Sage Weil <sage@newdream.net>
2020-08-24 19:53:08 +00:00
Shraddha Agrawal
d2ff5c5eb6 qa/tasks/cephadm.py: add ceph logs directory in job's info.yaml
This commit adds the file path of ceph log directories to the job's
info.yaml log file. The motivation behind this is, in case of job
timeout, the logs would still be tranferred to teuthology host
before nuking test machines using these ceph log directory paths in
job's info.yaml log file.

Signed-off-by: Shraddha Agrawal <shraddha.agrawal000@gmail.com>
2020-08-19 17:52:06 +05:30
Kefu Chai
2a377b01fd qa/tasks/cephadm: drop python2 support
Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-07-21 19:52:11 +08:00
Georgios Kyratsas
7e50ee3496
Merge pull request #35927 from gekios/wip-cephadm-image-fix
qa/tasks: fix cephadm config image check
2020-07-09 14:47:37 +02:00
Georgios Kyratsas
390ca4d92f qa/tasks: fix cephadm config image check
Check container_image_name only if ceph cluster image is not pre-defined in config.
We shouldn't care about container_image_name if there cephadm or ceph already have image defined.

Signed-off-by: Georgios Kyratsas <gkyratsas@suse.com>
2020-07-09 10:28:49 +02:00
Deepika Upadhyay
b0a14d6e1e docker/podman: tag crimson flavor container as 'sha-1-flavor'
see also: ceph/ceph-container#1704

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
2020-07-06 16:19:28 +05:30
Kefu Chai
2fa726b88c qa/tasks: flake8 fixes
Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-06-23 23:00:56 +08:00
Kyr Shatskyy
d8edde0c53 qa/tasks/cephadm: setup site based container registry
Add containers registry mirror for 'docker.io' to the config
file /etc/containers/registries.conf

Since we need site based config, so each teuthology instance
could have own containers' mirror, store corresponding data
in /etc/teuthology.yaml under 'overrides/cephadm' task specific
section.

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
2020-06-10 17:03:58 +02:00
Sebastian Wagner
115492f28f
Merge pull request #35069 from sebastian-philipp/qa-cephadm-add-rgw-and-iscsi
qa/cephadm: Add RGW

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-06-03 09:50:04 +02:00