RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 17:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #38974 into master

Browse Source 
* refs/pull/38974/head:
	qa/suites/rados/cephadm/upgrade: avoid allow_ptrace with old cephadm

Reviewed-by: Michael Fritch <mfritch@suse.com>
This commit is contained in:
Sage Weil 2021-01-23 11:03:10 -06:00
commit c6fba10f7f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/suites/rados/cephadm/upgrade/1-start.yaml
View File

@ -2,3 +2,5 @@ tasks:
- cephadm:
image: docker.io/ceph/ceph:v15.2.0
cephadm_branch: v15.2.0
# avoid --cap-add=PTRACE + --privileged for older cephadm versions
allow_ptrace: false

5
qa/tasks/cephadm.py
View File

@ -402,8 +402,9 @@ def ceph_bootstrap(ctx, config, registry):
'sudo chmod 0600 /root/.ssh/authorized_keys')
# set options
_shell(ctx, cluster_name, bootstrap_remote,
['ceph', 'config', 'set', 'mgr', 'mgr/cephadm/allow_ptrace', 'true'])
if config.get('allow_ptrace', True):
_shell(ctx, cluster_name, bootstrap_remote,
['ceph', 'config', 'set', 'mgr', 'mgr/cephadm/allow_ptrace', 'true'])
# add other hosts
for remote in ctx.cluster.remotes.keys():