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

Merge pull request #38789 from neha-ojha/wip-fix-cephadm-task

Browse Source 
qa/tasks/cephadm.py: do not create rbd pool by default

Reviewed-by: Sebastian Wagner <swagner@suse.com>
This commit is contained in:
Neha Ojha 2021-01-06 12:31:50 -08:00 committed by GitHub
commit ca4bc20f9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qa/suites/upgrade/octopus-x/0-start.yaml
View File

@ -25,6 +25,7 @@ openstack:
size: 10 # GB
overrides:
ceph:
create_rbd_pool: true
conf:
osd:
osd shutdown pgref assert: true

33
qa/tasks/cephadm.py
View File

@ -1019,25 +1019,24 @@ def crush_setup(ctx, config):
@contextlib.contextmanager
def create_rbd_pool(ctx, config):
cluster_name = config['cluster']
log.info('Waiting for OSDs to come up')
teuthology.wait_until_osds_up(
ctx,
cluster=ctx.cluster,
remote=ctx.ceph[cluster_name].bootstrap_remote,
ceph_cluster=cluster_name,
)
if config.get('create_rbd_pool', True):
log.info('Creating RBD pool')
_shell(ctx, cluster_name, ctx.ceph[cluster_name].bootstrap_remote,
args=['sudo', 'ceph', '--cluster', cluster_name,
'osd', 'pool', 'create', 'rbd', '8'])
_shell(ctx, cluster_name, ctx.ceph[cluster_name].bootstrap_remote,
args=[
'sudo', 'ceph', '--cluster', cluster_name,
if config.get('create_rbd_pool', False):
cluster_name = config['cluster']
log.info('Waiting for OSDs to come up')
teuthology.wait_until_osds_up(
ctx,
cluster=ctx.cluster,
remote=ctx.ceph[cluster_name].bootstrap_remote,
ceph_cluster=cluster_name,
)
log.info('Creating RBD pool')
_shell(ctx, cluster_name, ctx.ceph[cluster_name].bootstrap_remote,
args=['sudo', 'ceph', '--cluster', cluster_name,
'osd', 'pool', 'create', 'rbd', '8'])
_shell(ctx, cluster_name, ctx.ceph[cluster_name].bootstrap_remote,
args=['sudo', 'ceph', '--cluster', cluster_name,
'osd', 'pool', 'application', 'enable',
'rbd', 'rbd', '--yes-i-really-mean-it'
])
])
yield
@contextlib.contextmanager