From 407ce2613d37252e48c2a648b94b065ab070ec46 Mon Sep 17 00:00:00 2001 From: Vasu Kulkarni Date: Thu, 27 Jul 2017 15:24:25 -0700 Subject: [PATCH] use mon.a as ceph-admin node, the previous get_first_mon returns a sorted(mons)[0] as first mon. Signed-off-by: Vasu Kulkarni --- qa/tasks/ceph_deploy.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qa/tasks/ceph_deploy.py b/qa/tasks/ceph_deploy.py index a06183df723..4600b58f82b 100644 --- a/qa/tasks/ceph_deploy.py +++ b/qa/tasks/ceph_deploy.py @@ -28,7 +28,8 @@ def download_ceph_deploy(ctx, config): will use that instead. The `bootstrap` script is ran, with the argument obtained from `python_version`, if specified. """ - ceph_admin = ctx.cluster.only(teuthology.get_first_mon(ctx, config)) + # use mon.a for ceph_admin + (ceph_admin,) = ctx.cluster.only('mon.a').remotes.iterkeys() try: py_ver = str(config['python_version']) @@ -214,8 +215,8 @@ def build_ceph_cluster(ctx, config): # Expect to find ceph_admin on the first mon by ID, same place that the download task # puts it. Remember this here, because subsequently IDs will change from those in # the test config to those that ceph-deploy invents. - (ceph_admin,) = ctx.cluster.only( - teuthology.get_first_mon(ctx, config)).remotes.iterkeys() + + (ceph_admin,) = ctx.cluster.only('mon.a').remotes.iterkeys() def execute_ceph_deploy(cmd): """Remotely execute a ceph_deploy command""" @@ -714,8 +715,7 @@ def upgrade(ctx, config): # default to master ceph_branch = '--dev=master' # get the node used for initial deployment which is mon.a - (ceph_admin,) = ctx.cluster.only( - teuthology.get_first_mon(ctx, config)).remotes.iterkeys() + (ceph_admin,) = ctx.cluster.only('mon.a').remotes.iterkeys() testdir = teuthology.get_testdir(ctx) cmd = './ceph-deploy install ' + ceph_branch for role in roles: -- 2.39.5