Permalink
Browse files

Merge pull request #12867 from ceph/wip-ceph-deploy-workaround

qa/tasks/ceph-deploy: create-keys explicitly

Reviewed-by: Alfredo Deza <adeza@redhat.com>
  • Loading branch information...
2 parents 9f54e9f + 127e29e commit ebb02c8ef539b21b2cf4154fe4c43c59e87e146c @alfredodeza alfredodeza committed on GitHub Jan 10, 2017
Showing with 7 additions and 19 deletions.
  1. +0 −9 qa/suites/ceph-deploy/basic/tasks/ceph-admin-commands.yaml
  2. +7 −10 qa/tasks/ceph_deploy.py
@@ -1,12 +1,3 @@
-overrides:
- ceph-deploy:
- conf:
- global:
- debug ms: 1
- osd:
- debug osd: 10
- mon:
- debug mon: 10
roles:
- - mon.a
- mds.0
@@ -295,17 +295,14 @@ def execute_ceph_deploy(cmd):
# try the next block which will wait up to 15 minutes to gatherkeys.
execute_ceph_deploy(mon_create_nodes)
- estatus_gather = execute_ceph_deploy(gather_keys)
- max_gather_tries = 90
- gather_tries = 0
- while (estatus_gather != 0):
- gather_tries += 1
- if gather_tries >= max_gather_tries:
- msg = 'ceph-deploy was not able to gatherkeys after 15 minutes'
- raise RuntimeError(msg)
- estatus_gather = execute_ceph_deploy(gather_keys)
- time.sleep(10)
+ # create-keys is explicit now
+ # http://tracker.ceph.com/issues/16036
+ mons = ctx.cluster.only(teuthology.is_type('mon'))
+ for remote in mons.remotes.iterkeys():
+ remote.run(args=['sudo', 'ceph-create-keys', '--cluster', 'ceph',
+ '--id', remote.shortname])
+ estatus_gather = execute_ceph_deploy(gather_keys)
if mds_nodes:
estatus_mds = execute_ceph_deploy(deploy_mds)
if estatus_mds != 0:

0 comments on commit ebb02c8

Please sign in to comment.